avahi: Fix for multiple CVE's
PATCH 1/1 avahi: Fix for multiple CVE's
From: Vijay Anusuri <[email protected]>
Patches to fix:
CVE-2023-38469
CVE-2023-38470
CVE-2023-38471
CVE-2023-38472
CVE-2023-38473
Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf
&
https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237
&
https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c
&
https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09
&
https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40
&
https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797]
--- meta/recipes-connectivity/avahi/avahi_0.8.bb | 6 + .../avahi/files/CVE-2023-38469-1.patch | 47 ++++++++ .../avahi/files/CVE-2023-38469-2.patch | 65 +++++++++++ .../avahi/files/CVE-2023-38470.patch | 56 +++++++++ .../avahi/files/CVE-2023-38471.patch | 72 ++++++++++++ .../avahi/files/CVE-2023-38472.patch | 47 ++++++++ .../avahi/files/CVE-2023-38473.patch | 108 ++++++++++++++++++ 7 files changed, 401 insertions(+) create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch
meta/recipes-connectivity/avahi/avahi_0.8.bb +6 -0
@@ -26,6 +26,12 @@ SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV} file://0001-Fix-opening-etc-resolv.conf-error.patch \ file://handle-hup.patch \ file://local-ping.patch \ + file://CVE-2023-38469-1.patch \ + file://CVE-2023-38469-2.patch \ + file://CVE-2023-38470.patch \ + file://CVE-2023-38471.patch \ + file://CVE-2023-38472.patch \ + file://CVE-2023-38473.patch \ " UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/"
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +47 -0
47 lines not on this page · raw message
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +65 -0
65 lines not on this page · raw message
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +56 -0
56 lines not on this page · raw message
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +72 -0
72 lines not on this page · raw message
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +47 -0
47 lines not on this page · raw message
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +108 -0
108 lines not on this page · raw message
Signature · 1 line
2.25.1
Hi Vijay and Meenali,
Hopefully this will show everyone - especially WR and Montavista - that we need to communicate better when working on CVEs. In the short term at least, Marta proposed a wiki page which can be updated via a tool and when someone is working on an issue that can be marked to avoid duplication of effort. Would that be acceptable to both of your companies?
I’ve not checked that the fixes are identical, but apparently I need to remind everyone that we take fixes in *master first* and then backport to the releases in order.
Luckily the avahi recipe is fairly untouched so this should be trivial. Can you both discuss and agree who is going to do this?
Ross
Quoted 500 lines · Vijay Anusuri via lists.openembedded.org
From: Vijay Anusuri <[email protected]>
Patches to fix:
CVE-2023-38469
CVE-2023-38470
CVE-2023-38471
CVE-2023-38472
CVE-2023-38473Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf
&
https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237
&
https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c
&
https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09
&
https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40
&
https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797]Signed-off-by Vijay Anusuri <[email protected]>---
meta/recipes-connectivity/avahi/avahi_0.8.bb | 6 + .../avahi/files/CVE-2023-38469-1.patch | 47 ++++++++ .../avahi/files/CVE-2023-38469-2.patch | 65 +++++++++++ .../avahi/files/CVE-2023-38470.patch | 56 +++++++++ .../avahi/files/CVE-2023-38471.patch | 72 ++++++++++++ .../avahi/files/CVE-2023-38472.patch | 47 ++++++++ .../avahi/files/CVE-2023-38473.patch | 108 ++++++++++++++++++ 7 files changed, 401 insertions(+)create mode 100644
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38470.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38471.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38472.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38473.patchmeta/recipes-connectivity/avahi/avahi_0.8.bb +6
-0@@ -26,6 +26,12 @@ SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV} file://0001-Fix-opening-etc-resolv.conf-error.patch \ file://handle-hup.patch \ file://local-ping.patch \ + file://CVE-2023-38469-1.patch \ + file://CVE-2023-38469-2.patch \ + file://CVE-2023-38470.patch \ + file://CVE-2023-38471.patch \ + file://CVE-2023-38472.patch \ + file://CVE-2023-38473.patch \ "
UPSTREAM_CHECK_URI= "https://github.com/lathiat/avahi/releases/"meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +47
-0@@ -0,0 +1,47 @@ +From a337a1ba7d15853fb56deef1f464529af6e3a1cf Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin <[email protected]> +Date: Mon, 23 Oct 2023 20:29:31 +0000 +Subject: [PATCH] core: reject overly long TXT resource records + +Closes https://github.com/lathiat/avahi/issues/455 + +CVE-2023-38469 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf] +CVE: CVE-2023-38469 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-core/rr.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/avahi-core/rr.c b/avahi-core/rr.c +index 2bb89244..9c04ebbd 100644 +--- a/avahi-core/rr.c ++++ b/avahi-core/rr.c +@@ -32,6 +32,7 @@ + #include <avahi-common/malloc.h> + #include <avahi-common/defs.h> + ++#include "dns.h" + #include "rr.h" + #include "log.h" + #include "util.h" +@@ -689,11 +690,17 @@ int avahi_record_is_valid(AvahiRecord *r) { + case AVAHI_DNS_TYPE_TXT: { + + AvahiStringList *strlst; ++ size_t used = 0; + +- for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) ++ for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) { + if (strlst->size > 255 || strlst->size <= 0) + return 0; + ++ used += 1+strlst->size; ++ if (used > AVAHI_DNS_RDATA_MAX) ++ return 0; ++ } ++ + return 1; + } + }meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +65
-0@@ -0,0 +1,65 @@ +From c6cab87df290448a63323c8ca759baa516166237 Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin <[email protected]> +Date: Wed, 25 Oct 2023 18:15:42 +0000 +Subject: [PATCH] tests: pass overly long TXT resource records + +to make sure they don't crash avahi any more. + +It reproduces https://github.com/lathiat/avahi/issues/455 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237] +CVE: CVE-2023-38469 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-client/client-test.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c +index 7d04a6a..66e3574 100644 +--- a/avahi-client/client-test.c ++++ b/avahi-client/client-test.c +@@ -22,6 +22,7 @@ + #endif + + #include <stdio.h> ++#include <string.h> + #include <assert.h> + + #include <avahi-client/client.h> +@@ -33,6 +34,8 @@ + #include <avahi-common/malloc.h> + #include <avahi-common/timeval.h> + ++#include <avahi-core/dns.h> ++ + static const AvahiPoll *poll_api = NULL; + static AvahiSimplePoll *simple_poll = NULL; + +@@ -222,6 +225,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + uint32_t cookie; + struct timeval tv; + AvahiAddress a; ++ uint8_t rdata[AVAHI_DNS_RDATA_MAX+1]; ++ AvahiStringList *txt = NULL; ++ int r; + + simple_poll = avahi_simple_poll_new(); + poll_api = avahi_simple_poll_get(simple_poll); +@@ -258,6 +264,14 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + printf("%s\n", avahi_strerror(avahi_entry_group_add_service (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "Lathiat's Site", "_http._tcp", NULL, NULL, 80, "foo=bar", NULL))); + printf("add_record: %d\n", avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "\5booya", 6)); + ++ memset(rdata, 1, sizeof(rdata)); ++ r = avahi_string_list_parse(rdata, sizeof(rdata), &txt); ++ assert(r >= 0); ++ assert(avahi_string_list_serialize(txt, NULL, 0) == sizeof(rdata)); ++ error = avahi_entry_group_add_service_strlst(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", "_qotd._tcp", NULL, NULL, 123, txt); ++ assert(error == AVAHI_ERR_INVALID_RECORD); ++ avahi_string_list_free(txt); ++ + avahi_entry_group_commit (group); + + domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, avahi_domain_browser_callback, (char*) "omghai3u"); +-- +2.25.1 +meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +56
-0@@ -0,0 +1,56 @@ +From 94cb6489114636940ac683515417990b55b5d66c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <[email protected]> +Date: Tue, 11 Apr 2023 15:29:59 +0200 +Subject: [PATCH] Ensure each label is at least one byte long + +The only allowed exception is single dot, where it should return empty +string. + +Fixes #454. + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c] +CVE: CVE-2023-38470 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-common/domain-test.c | 14 ++++++++++++++ + avahi-common/domain.c | 2 +- + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/avahi-common/domain-test.c b/avahi-common/domain-test.c +index cf763eca6..3acc1c1e4 100644 +--- a/avahi-common/domain-test.c ++++ b/avahi-common/domain-test.c +@@ -45,6 +45,20 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + printf("%s\n", s = avahi_normalize_name_strdup("fo\\\\o\\..f oo.")); + avahi_free(s); + ++ printf("%s\n", s = avahi_normalize_name_strdup(".")); ++ avahi_free(s); ++ ++ s = avahi_normalize_name_strdup(",.=.}.=.?-.}.=.?.?.}.}.?.?.?.z.?.?.}.}." ++ "}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.}.}.}" ++ ".?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.?.zM.?`" ++ "?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}??.}.}.?.?." ++ "?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.?`?.}.}.}." ++ "??.?.zM.?`?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}?" ++ "?.}.}.?.?.?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM." ++ "?`?.}.}.}.?.?.?.r.=.=.?.?`.?.?}.}.}.?.?.?.r.=.?.}.=.?.?." ++ "}.?.?.?.}.=.?.?.}"); ++ assert(s == NULL); ++ + printf("%i\n", avahi_domain_equal("\\065aa bbb\\.\\046cc.cc\\\\.dee.fff.", "Aaa BBB\\.\\.cc.cc\\\\.dee.fff")); + printf("%i\n", avahi_domain_equal("A", "a")); + +diff --git a/avahi-common/domain.c b/avahi-common/domain.c +index 3b1ab6834..e66d2416c 100644 +--- a/avahi-common/domain.c ++++ b/avahi-common/domain.c +@@ -201,7 +201,7 @@ char *avahi_normalize_name(const char *s, char *ret_s, size_t size) { + } + + if (!empty) { +- if (size < 1) ++ if (size < 2) + return NULL; + + *(r++) = '.';meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +72
-0@@ -0,0 +1,72 @@ +From 894f085f402e023a98cbb6f5a3d117bd88d93b09 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]> +Date: Mon, 23 Oct 2023 13:38:35 +0200 +Subject: [PATCH] core: extract host name using avahi_unescape_label() + +Previously we could create invalid escape sequence when we split the +string on dot. For example, from valid host name "foo\\.bar" we have +created invalid name "foo\\" and tried to set that as the host name +which crashed the daemon. + +Fixes #453 + +CVE-2023-38471 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09] +CVE: CVE-2023-38471 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-core/server.c | 27 +++++++++++++++++++++------ + 1 file changed, 21 insertions(+), 6 deletions(-) + +diff --git a/avahi-core/server.c b/avahi-core/server.c +index c32637af8..f6a21bb77 100644 +--- a/avahi-core/server.c ++++ b/avahi-core/server.c +@@ -1295,7 +1295,11 @@ static void update_fqdn(AvahiServer *s) { + } + + int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { +- char *hn = NULL; ++ char label_escaped[AVAHI_LABEL_MAX*4+1]; ++ char label[AVAHI_LABEL_MAX]; ++ char *hn = NULL, *h; ++ size_t len; ++ + assert(s); + + AVAHI_CHECK_VALIDITY(s, !host_name || avahi_is_valid_host_name(host_name), AVAHI_ERR_INVALID_HOST_NAME); +@@ -1305,17 +1309,28 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { + else + hn = avahi_normalize_name_strdup(host_name); + +- hn[strcspn(hn, ".")] = 0; ++ h = hn; ++ if (!avahi_unescape_label((const char **)&hn, label, sizeof(label))) { ++ avahi_free(h); ++ return AVAHI_ERR_INVALID_HOST_NAME; ++ } ++ ++ avahi_free(h); ++ ++ h = label_escaped; ++ len = sizeof(label_escaped); ++ if (!avahi_escape_label(label, strlen(label), &h, &len)) ++ return AVAHI_ERR_INVALID_HOST_NAME; + +- if (avahi_domain_equal(s->host_name, hn) && s->state != AVAHI_SERVER_COLLISION) { +- avahi_free(hn); ++ if (avahi_domain_equal(s->host_name, label_escaped) && s->state != AVAHI_SERVER_COLLISION) + return avahi_server_set_errno(s, AVAHI_ERR_NO_CHANGE); +- } + + withdraw_host_rrs(s); + + avahi_free(s->host_name); +- s->host_name = hn; ++ s->host_name = avahi_strdup(label_escaped); ++ if (!s->host_name) ++ return AVAHI_ERR_NO_MEMORY; + + update_fqdn(s); +meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +47
-0@@ -0,0 +1,47 @@ +From b024ae5749f4aeba03478e6391687c3c9c8dee40 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]> +Date: Thu, 19 Oct 2023 17:36:44 +0200 +Subject: [PATCH] core: make sure there is rdata to process before parsing it + +Fixes #452 + +CVE-2023-38472 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40] +CVE: CVE-2023-38472 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-client/client-test.c | 3 +++ + avahi-daemon/dbus-entry-group.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c +index 66e3574..9a015d7 100644 +--- a/avahi-client/client-test.c ++++ b/avahi-client/client-test.c +@@ -272,6 +272,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + assert(error == AVAHI_ERR_INVALID_RECORD); + avahi_string_list_free(txt); + ++ error = avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "", 0); ++ assert(error != AVAHI_OK); ++ + avahi_entry_group_commit (group); + + domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, avahi_domain_browser_callback, (char*) "omghai3u"); +diff --git a/avahi-daemon/dbus-entry-group.c b/avahi-daemon/dbus-entry-group.c +index 4e879a5..aa23d4b 100644 +--- a/avahi-daemon/dbus-entry-group.c ++++ b/avahi-daemon/dbus-entry-group.c +@@ -340,7 +340,7 @@ DBusHandlerResult avahi_dbus_msg_entry_group_impl(DBusConnection *c, DBusMessage + if (!(r = avahi_record_new_full (name, clazz, type, ttl))) + return avahi_dbus_respond_error(c, m, AVAHI_ERR_NO_MEMORY, NULL); + +- if (avahi_rdata_parse (r, rdata, size) < 0) { ++ if (!rdata || avahi_rdata_parse (r, rdata, size) < 0) { + avahi_record_unref (r); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_INVALID_RDATA, NULL); + } +-- +2.25.1 +meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +108
-0@@ -0,0 +1,108 @@ +From b448c9f771bada14ae8de175695a9729f8646797 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]> +Date: Wed, 11 Oct 2023 17:45:44 +0200 +Subject: [PATCH] common: derive alternative host name from its unescaped + version + +Normalization of input makes sure we don't have to deal with special +cases like unescaped dot at the end of label. + +Fixes #451 #487 +CVE-2023-38473 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797] +CVE: CVE-2023-38473 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-common/alternative-test.c | 3 +++ + avahi-common/alternative.c | 27 +++++++++++++++++++-------- + 2 files changed, 22 insertions(+), 8 deletions(-) + +diff --git a/avahi-common/alternative-test.c b/avahi-common/alternative-test.c +index 9255435ec..681fc15b8 100644 +--- a/avahi-common/alternative-test.c ++++ b/avahi-common/alternative-test.c +@@ -31,6 +31,9 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + const char* const test_strings[] = { + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXüüüüüüü", ++ ").", ++ "\\.", ++ "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\\\\", + "gurke", + "-", + " #", +diff --git a/avahi-common/alternative.c b/avahi-common/alternative.c +index b3d39f0ed..a094e6d76 100644 +--- a/avahi-common/alternative.c ++++ b/avahi-common/alternative.c +@@ -49,15 +49,20 @@ static void drop_incomplete_utf8(char *c) { + } + + char *avahi_alternative_host_name(const char *s) { ++ char label[AVAHI_LABEL_MAX], alternative[AVAHI_LABEL_MAX*4+1]; ++ char *alt, *r, *ret; + const char *e; +- char *r; ++ size_t len; + + assert(s); + + if (!avahi_is_valid_host_name(s)) + return NULL; + +- if ((e = strrchr(s, '-'))) { ++ if (!avahi_unescape_label(&s, label, sizeof(label))) ++ return NULL; ++ ++ if ((e = strrchr(label, '-'))) { + const char *p; + + e++; +@@ -74,19 +79,18 @@ char *avahi_alternative_host_name(const char *s) { + + if (e) { + char *c, *m; +- size_t l; + int n; + + n = atoi(e)+1; + if (!(m = avahi_strdup_printf("%i", n))) + return NULL; + +- l = e-s-1; ++ len = e-label-1; + +- if (l >= AVAHI_LABEL_MAX-1-strlen(m)-1) +- l = AVAHI_LABEL_MAX-1-strlen(m)-1; ++ if (len >= AVAHI_LABEL_MAX-1-strlen(m)-1) ++ len = AVAHI_LABEL_MAX-1-strlen(m)-1; + +- if (!(c = avahi_strndup(s, l))) { ++ if (!(c = avahi_strndup(label, len))) { + avahi_free(m); + return NULL; + } +@@ -100,7 +104,7 @@ char *avahi_alternative_host_name(const char *s) { + } else { + char *c; + +- if (!(c = avahi_strndup(s, AVAHI_LABEL_MAX-1-2))) ++ if (!(c = avahi_strndup(label, AVAHI_LABEL_MAX-1-2))) + return NULL; + + drop_incomplete_utf8(c); +@@ -109,6 +113,13 @@ char *avahi_alternative_host_name(const char *s) { + avahi_free(c); + } + ++ alt = alternative; ++ len = sizeof(alternative); ++ ret = avahi_escape_label(r, strlen(r), &alt, &len); ++ ++ avahi_free(r); ++ r = avahi_strdup(ret); ++ + assert(avahi_is_valid_host_name(r)); + + return r;Signature · 10 lines
2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#190751): https://lists.openembedded.org/g/openembedded-core/message/190751 Mute This Topic: https://lists.openembedded.org/mt/102621335/6875888 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Quoted 3 lines · Ross Burton
Hi Vijay and Meenali,
Hopefully this will show everyone - especially WR and Montavista - that we need to communicate better when working on CVEs. In the short term at least, Marta proposed a wiki page which can be updated via a tool and when someone is working on an issue that can be marked to avoid duplication of effort. Would that be acceptable to both of your companies?
Yeah, I think something like that would be great on our end, provided its automated and the data can be extracted, so it can be consolidated in internal CVE tracking that we are currently required to.
Quoted 2 lines
I’ve not checked that the fixes are identical, but apparently I need to remind everyone that we take fixes in *master first* and then backport to the releases in order.
There should also be an agree upon change decoration to indicate non-applicability/differently addressed in earlier releases.
With 4 year LTS releases many issues are just not going to be applicable to master. Also there may well be very good reasons to fix a given set of CVEs in completely different ways, but making sure they are addressed in both is important. Setting aside this example, in almost all cases on master moving to the fixed version, is almost always the right answer, where as on say dunfell, moving to the new version may have too many knock on effects to make sense. In this instance, Khem has already indicated moving to the new release may make sense for both kirkstone and master.
Quoted 2 lines
Luckily the avahi recipe is fairly untouched so this should be trivial. Can you both discuss and agree who is going to do this?
Vijay can you work with Meenali to consolidate this patch.
Quoted 506 lines
Ross
Quoted 494 lines · Vijay Anusuri via lists.openembedded.org
From: Vijay Anusuri <[email protected]>
Patches to fix:
CVE-2023-38469
CVE-2023-38470
CVE-2023-38471
CVE-2023-38472
CVE-2023-38473Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf
&
https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237
&
https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c
&
https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09
&
https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40
&
https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797]Signed-off-by Vijay Anusuri <[email protected]>---
meta/recipes-connectivity/avahi/avahi_0.8.bb | 6 + .../avahi/files/CVE-2023-38469-1.patch | 47 ++++++++ .../avahi/files/CVE-2023-38469-2.patch | 65 +++++++++++ .../avahi/files/CVE-2023-38470.patch | 56 +++++++++ .../avahi/files/CVE-2023-38471.patch | 72 ++++++++++++ .../avahi/files/CVE-2023-38472.patch | 47 ++++++++ .../avahi/files/CVE-2023-38473.patch | 108 ++++++++++++++++++ 7 files changed, 401 insertions(+)create mode 100644
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38470.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38471.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38472.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38473.patchmeta/recipes-connectivity/avahi/avahi_0.8.bb +6
-0@@ -26,6 +26,12 @@ SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV} file://0001-Fix-opening-etc-resolv.conf-error.patch \ file://handle-hup.patch \ file://local-ping.patch \ + file://CVE-2023-38469-1.patch \ + file://CVE-2023-38469-2.patch \ + file://CVE-2023-38470.patch \ + file://CVE-2023-38471.patch \ + file://CVE-2023-38472.patch \ + file://CVE-2023-38473.patch \ "
UPSTREAM_CHECK_URI= "https://github.com/lathiat/avahi/releases/"meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +47
-0@@ -0,0 +1,47 @@ +From a337a1ba7d15853fb56deef1f464529af6e3a1cf Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin <[email protected]> +Date: Mon, 23 Oct 2023 20:29:31 +0000 +Subject: [PATCH] core: reject overly long TXT resource records + +Closes https://github.com/lathiat/avahi/issues/455 + +CVE-2023-38469 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf] +CVE: CVE-2023-38469 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-core/rr.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/avahi-core/rr.c b/avahi-core/rr.c +index 2bb89244..9c04ebbd 100644 +--- a/avahi-core/rr.c ++++ b/avahi-core/rr.c +@@ -32,6 +32,7 @@ + #include <avahi-common/malloc.h> + #include <avahi-common/defs.h> + ++#include "dns.h" + #include "rr.h" + #include "log.h" + #include "util.h" +@@ -689,11 +690,17 @@ int avahi_record_is_valid(AvahiRecord *r) { + case AVAHI_DNS_TYPE_TXT: { + + AvahiStringList *strlst; ++ size_t used = 0; + +- for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) ++ for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) { + if (strlst->size > 255 || strlst->size <= 0) + return 0; + ++ used += 1+strlst->size; ++ if (used > AVAHI_DNS_RDATA_MAX) ++ return 0; ++ } ++ + return 1; + } + }meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +65
-0@@ -0,0 +1,65 @@ +From c6cab87df290448a63323c8ca759baa516166237 Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin <[email protected]> +Date: Wed, 25 Oct 2023 18:15:42 +0000 +Subject: [PATCH] tests: pass overly long TXT resource records + +to make sure they don't crash avahi any more. + +It reproduces https://github.com/lathiat/avahi/issues/455 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237] +CVE: CVE-2023-38469 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-client/client-test.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c +index 7d04a6a..66e3574 100644 +--- a/avahi-client/client-test.c ++++ b/avahi-client/client-test.c +@@ -22,6 +22,7 @@ + #endif + + #include <stdio.h> ++#include <string.h> + #include <assert.h> + + #include <avahi-client/client.h> +@@ -33,6 +34,8 @@ + #include <avahi-common/malloc.h> + #include <avahi-common/timeval.h> + ++#include <avahi-core/dns.h> ++ + static const AvahiPoll *poll_api = NULL; + static AvahiSimplePoll *simple_poll = NULL; + +@@ -222,6 +225,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + uint32_t cookie; + struct timeval tv; + AvahiAddress a; ++ uint8_t rdata[AVAHI_DNS_RDATA_MAX+1]; ++ AvahiStringList *txt = NULL; ++ int r; + + simple_poll = avahi_simple_poll_new(); + poll_api = avahi_simple_poll_get(simple_poll); +@@ -258,6 +264,14 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + printf("%s\n", avahi_strerror(avahi_entry_group_add_service (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "Lathiat's Site", "_http._tcp", NULL, NULL, 80, "foo=bar", NULL))); + printf("add_record: %d\n", avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "\5booya", 6)); + ++ memset(rdata, 1, sizeof(rdata)); ++ r = avahi_string_list_parse(rdata, sizeof(rdata), &txt); ++ assert(r >= 0); ++ assert(avahi_string_list_serialize(txt, NULL, 0) == sizeof(rdata)); ++ error = avahi_entry_group_add_service_strlst(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", "_qotd._tcp", NULL, NULL, 123, txt); ++ assert(error == AVAHI_ERR_INVALID_RECORD); ++ avahi_string_list_free(txt); ++ + avahi_entry_group_commit (group); + + domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, avahi_domain_browser_callback, (char*) "omghai3u"); +-- +2.25.1 +meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +56
-0@@ -0,0 +1,56 @@ +From 94cb6489114636940ac683515417990b55b5d66c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <[email protected]> +Date: Tue, 11 Apr 2023 15:29:59 +0200 +Subject: [PATCH] Ensure each label is at least one byte long + +The only allowed exception is single dot, where it should return empty +string. + +Fixes #454. + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c] +CVE: CVE-2023-38470 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-common/domain-test.c | 14 ++++++++++++++ + avahi-common/domain.c | 2 +- + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/avahi-common/domain-test.c b/avahi-common/domain-test.c +index cf763eca6..3acc1c1e4 100644 +--- a/avahi-common/domain-test.c ++++ b/avahi-common/domain-test.c +@@ -45,6 +45,20 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + printf("%s\n", s = avahi_normalize_name_strdup("fo\\\\o\\..f oo.")); + avahi_free(s); + ++ printf("%s\n", s = avahi_normalize_name_strdup(".")); ++ avahi_free(s); ++ ++ s = avahi_normalize_name_strdup(",.=.}.=.?-.}.=.?.?.}.}.?.?.?.z.?.?.}.}." ++ "}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.}.}.}" ++ ".?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.?.zM.?`" ++ "?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}??.}.}.?.?." ++ "?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.?`?.}.}.}." ++ "??.?.zM.?`?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}?" ++ "?.}.}.?.?.?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM." ++ "?`?.}.}.}.?.?.?.r.=.=.?.?`.?.?}.}.}.?.?.?.r.=.?.}.=.?.?." ++ "}.?.?.?.}.=.?.?.}"); ++ assert(s == NULL); ++ + printf("%i\n", avahi_domain_equal("\\065aa bbb\\.\\046cc.cc\\\\.dee.fff.", "Aaa BBB\\.\\.cc.cc\\\\.dee.fff")); + printf("%i\n", avahi_domain_equal("A", "a")); + +diff --git a/avahi-common/domain.c b/avahi-common/domain.c +index 3b1ab6834..e66d2416c 100644 +--- a/avahi-common/domain.c ++++ b/avahi-common/domain.c +@@ -201,7 +201,7 @@ char *avahi_normalize_name(const char *s, char *ret_s, size_t size) { + } + + if (!empty) { +- if (size < 1) ++ if (size < 2) + return NULL; + + *(r++) = '.';meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +72
-0@@ -0,0 +1,72 @@ +From 894f085f402e023a98cbb6f5a3d117bd88d93b09 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]> +Date: Mon, 23 Oct 2023 13:38:35 +0200 +Subject: [PATCH] core: extract host name using avahi_unescape_label() + +Previously we could create invalid escape sequence when we split the +string on dot. For example, from valid host name "foo\\.bar" we have +created invalid name "foo\\" and tried to set that as the host name +which crashed the daemon. + +Fixes #453 + +CVE-2023-38471 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09] +CVE: CVE-2023-38471 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-core/server.c | 27 +++++++++++++++++++++------ + 1 file changed, 21 insertions(+), 6 deletions(-) + +diff --git a/avahi-core/server.c b/avahi-core/server.c +index c32637af8..f6a21bb77 100644 +--- a/avahi-core/server.c ++++ b/avahi-core/server.c +@@ -1295,7 +1295,11 @@ static void update_fqdn(AvahiServer *s) { + } + + int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { +- char *hn = NULL; ++ char label_escaped[AVAHI_LABEL_MAX*4+1]; ++ char label[AVAHI_LABEL_MAX]; ++ char *hn = NULL, *h; ++ size_t len; ++ + assert(s); + + AVAHI_CHECK_VALIDITY(s, !host_name || avahi_is_valid_host_name(host_name), AVAHI_ERR_INVALID_HOST_NAME); +@@ -1305,17 +1309,28 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { + else + hn = avahi_normalize_name_strdup(host_name); + +- hn[strcspn(hn, ".")] = 0; ++ h = hn; ++ if (!avahi_unescape_label((const char **)&hn, label, sizeof(label))) { ++ avahi_free(h); ++ return AVAHI_ERR_INVALID_HOST_NAME; ++ } ++ ++ avahi_free(h); ++ ++ h = label_escaped; ++ len = sizeof(label_escaped); ++ if (!avahi_escape_label(label, strlen(label), &h, &len)) ++ return AVAHI_ERR_INVALID_HOST_NAME; + +- if (avahi_domain_equal(s->host_name, hn) && s->state != AVAHI_SERVER_COLLISION) { +- avahi_free(hn); ++ if (avahi_domain_equal(s->host_name, label_escaped) && s->state != AVAHI_SERVER_COLLISION) + return avahi_server_set_errno(s, AVAHI_ERR_NO_CHANGE); +- } + + withdraw_host_rrs(s); + + avahi_free(s->host_name); +- s->host_name = hn; ++ s->host_name = avahi_strdup(label_escaped); ++ if (!s->host_name) ++ return AVAHI_ERR_NO_MEMORY; + + update_fqdn(s); +meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +47
-0@@ -0,0 +1,47 @@ +From b024ae5749f4aeba03478e6391687c3c9c8dee40 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]> +Date: Thu, 19 Oct 2023 17:36:44 +0200 +Subject: [PATCH] core: make sure there is rdata to process before parsing it + +Fixes #452 + +CVE-2023-38472 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40] +CVE: CVE-2023-38472 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-client/client-test.c | 3 +++ + avahi-daemon/dbus-entry-group.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c +index 66e3574..9a015d7 100644 +--- a/avahi-client/client-test.c ++++ b/avahi-client/client-test.c +@@ -272,6 +272,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + assert(error == AVAHI_ERR_INVALID_RECORD); + avahi_string_list_free(txt); + ++ error = avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "", 0); ++ assert(error != AVAHI_OK); ++ + avahi_entry_group_commit (group); + + domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, avahi_domain_browser_callback, (char*) "omghai3u"); +diff --git a/avahi-daemon/dbus-entry-group.c b/avahi-daemon/dbus-entry-group.c +index 4e879a5..aa23d4b 100644 +--- a/avahi-daemon/dbus-entry-group.c ++++ b/avahi-daemon/dbus-entry-group.c +@@ -340,7 +340,7 @@ DBusHandlerResult avahi_dbus_msg_entry_group_impl(DBusConnection *c, DBusMessage + if (!(r = avahi_record_new_full (name, clazz, type, ttl))) + return avahi_dbus_respond_error(c, m, AVAHI_ERR_NO_MEMORY, NULL); + +- if (avahi_rdata_parse (r, rdata, size) < 0) { ++ if (!rdata || avahi_rdata_parse (r, rdata, size) < 0) { + avahi_record_unref (r); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_INVALID_RDATA, NULL); + } +-- +2.25.1 +meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +108
-0@@ -0,0 +1,108 @@ +From b448c9f771bada14ae8de175695a9729f8646797 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]> +Date: Wed, 11 Oct 2023 17:45:44 +0200 +Subject: [PATCH] common: derive alternative host name from its unescaped + version + +Normalization of input makes sure we don't have to deal with special +cases like unescaped dot at the end of label. + +Fixes #451 #487 +CVE-2023-38473 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797] +CVE: CVE-2023-38473 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-common/alternative-test.c | 3 +++ + avahi-common/alternative.c | 27 +++++++++++++++++++-------- + 2 files changed, 22 insertions(+), 8 deletions(-) + +diff --git a/avahi-common/alternative-test.c b/avahi-common/alternative-test.c +index 9255435ec..681fc15b8 100644 +--- a/avahi-common/alternative-test.c ++++ b/avahi-common/alternative-test.c +@@ -31,6 +31,9 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + const char* const test_strings[] = { + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXüüüüüüü", ++ ").", ++ "\\.", ++ "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\\\\", + "gurke", + "-", + " #", +diff --git a/avahi-common/alternative.c b/avahi-common/alternative.c +index b3d39f0ed..a094e6d76 100644 +--- a/avahi-common/alternative.c ++++ b/avahi-common/alternative.c +@@ -49,15 +49,20 @@ static void drop_incomplete_utf8(char *c) { + } + + char *avahi_alternative_host_name(const char *s) { ++ char label[AVAHI_LABEL_MAX], alternative[AVAHI_LABEL_MAX*4+1]; ++ char *alt, *r, *ret; + const char *e; +- char *r; ++ size_t len; + + assert(s); + + if (!avahi_is_valid_host_name(s)) + return NULL; + +- if ((e = strrchr(s, '-'))) { ++ if (!avahi_unescape_label(&s, label, sizeof(label))) ++ return NULL; ++ ++ if ((e = strrchr(label, '-'))) { + const char *p; + + e++; +@@ -74,19 +79,18 @@ char *avahi_alternative_host_name(const char *s) { + + if (e) { + char *c, *m; +- size_t l; + int n; + + n = atoi(e)+1; + if (!(m = avahi_strdup_printf("%i", n))) + return NULL; + +- l = e-s-1; ++ len = e-label-1; + +- if (l >= AVAHI_LABEL_MAX-1-strlen(m)-1) +- l = AVAHI_LABEL_MAX-1-strlen(m)-1; ++ if (len >= AVAHI_LABEL_MAX-1-strlen(m)-1) ++ len = AVAHI_LABEL_MAX-1-strlen(m)-1; + +- if (!(c = avahi_strndup(s, l))) { ++ if (!(c = avahi_strndup(label, len))) { + avahi_free(m); + return NULL; + } +@@ -100,7 +104,7 @@ char *avahi_alternative_host_name(const char *s) { + } else { + char *c; + +- if (!(c = avahi_strndup(s, AVAHI_LABEL_MAX-1-2))) ++ if (!(c = avahi_strndup(label, AVAHI_LABEL_MAX-1-2))) + return NULL; + + drop_incomplete_utf8(c); +@@ -109,6 +113,13 @@ char *avahi_alternative_host_name(const char *s) { + avahi_free(c); + } + ++ alt = alternative; ++ len = sizeof(alternative); ++ ret = avahi_escape_label(r, strlen(r), &alt, &len); ++ ++ avahi_free(r); ++ r = avahi_strdup(ret); ++ + assert(avahi_is_valid_host_name(r)); + + return r;Signature · 1 line
2.25.1-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190782): https://lists.openembedded.org/g/openembedded-core/message/190782
Mute This Topic: https://lists.openembedded.org/mt/102621335/2167262
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 2 lines
Jeremy Puhlman [email protected]
Hi Ross,
As discussed with Meenali, I agreed she was going to do this work. She has already submitted patches for multiple branches ( master, mickledore and kirkstone ).
For CVE-2023-38469, we need to include 2 commits to fix the CVE. Meenali will send the v2 patch for CVE-2023-38469 which will include 2 patches for all the branches.
Thank you Meenali for your timely response.
Thanks & Regards,
Vijay
Quoted 628 lines · Jeremy Puhlman via lists.openembedded.org
Quoted 3 lines · Ross Burton
Hi Vijay and Meenali,
Hopefully this will show everyone - especially WR and Montavista - that
we need to communicate better when working on CVEs. In the short term at least, Marta proposed a wiki page which can be updated via a tool and when someone is working on an issue that can be marked to avoid duplication of effort. Would that be acceptable to both of your companies?
Yeah, I think something like that would be great on our end, provided its automated and the data can be extracted, so it can be consolidated in internal CVE tracking that we are currently required to.
Quoted 2 lines
I’ve not checked that the fixes are identical, but apparently I need to
remind everyone that we take fixes in *master first* and then backport to the releases in order.
There should also be an agree upon change decoration to indicate non-applicability/differently addressed in earlier releases.With 4 year LTS releases many issues are just not going to be applicable to master. Also there may well be very good reasons to fix a given set of CVEs in
completely different ways, but making sure they are addressed in both is important. Setting aside this example, in almost all cases on master moving to the fixed version, is almost always the right answer, where as on say dunfell, moving to the new version may have too many knock on effects to make sense.
In this instance, Khem has already indicated moving to the new release may make sense for both kirkstone and master.Quoted 2 lines
Luckily the avahi recipe is fairly untouched so this should be trivial.
Can you both discuss and agree who is going to do this? Vijay can you work with Meenali to consolidate this patch.
Quoted 4 lines
Ross
Quoted 1 line
On 16 Nov 2023, at 04:05, Vijay Anusuri via lists.openembedded.org
Quoted 11 lines · <[email protected]> wrote:
Quoted 11 lines
From: Vijay Anusuri <[email protected]>
Patches to fix:
CVE-2023-38469
CVE-2023-38470
CVE-2023-38471
CVE-2023-38472
CVE-2023-38473Upstream-Status: Backport [
https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf
Quoted 2 lines
Quoted 2 lines
&
https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237
Quoted 2 lines
Quoted 2 lines
&
https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c
Quoted 2 lines
Quoted 2 lines
&
https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09
Quoted 2 lines
Quoted 2 lines
&
https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40
Quoted 2 lines
Quoted 2 lines
&
https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797
]Quoted 12 lines
Quoted 11 lines
Signed-off-by Vijay Anusuri <[email protected]>---
meta/recipes-connectivity/avahi/avahi_0.8.bb | 6 + .../avahi/files/CVE-2023-38469-1.patch | 47 ++++++++ .../avahi/files/CVE-2023-38469-2.patch | 65 +++++++++++ .../avahi/files/CVE-2023-38470.patch | 56 +++++++++ .../avahi/files/CVE-2023-38471.patch | 72 ++++++++++++ .../avahi/files/CVE-2023-38472.patch | 47 ++++++++ .../avahi/files/CVE-2023-38473.patch | 108 ++++++++++++++++++ 7 files changed, 401 insertions(+)Quoted 1 line
create mode 100644
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patchQuoted 1 line
Quoted 1 line
create mode 100644
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patchQuoted 1 line
Quoted 1 line
create mode 100644
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patchQuoted 1 line
Quoted 1 line
create mode 100644
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patchQuoted 1 line
Quoted 1 line
create mode 100644
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patchQuoted 1 line
Quoted 1 line
create mode 100644
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patchQuoted 2 lines
Review
Quoted 2 lines
(quoted diff) +0
-0b/meta/recipes-connectivity/avahi/avahi_0.8.bb
Quoted 4 lines
meta/recipes-connectivity/avahi/avahi_0.8.bb SRC_URI = "
Quoted 4 lines
index
b5c966c102..772fb43939100644meta/recipes-connectivity/avahi/avahi_0.8.bb +0
-0@@ -26,6 +26,12 @@ SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}
Quoted 11 lines
Quoted 11 lines
meta/recipes-connectivity/avahi/avahi_0.8.bb +6
-0file://0001-Fix-opening-etc-resolv.conf-error.patch \ file://handle-hup.patch \ file://local-ping.patch \ + file://CVE-2023-38469-1.patch \ + file://CVE-2023-38469-2.patch \ + file://CVE-2023-38470.patch \ + file://CVE-2023-38471.patch \ + file://CVE-2023-38472.patch \ + file://CVE-2023-38473.patch \ "Quoted 2 lines
Quoted 2 lines
UPSTREAM_CHECK_URI= "https://github.com/lathiat/avahi/releases/" diff --git
a/meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patchb/meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patchQuoted 7 lines
Quoted 7 lines
new file mode 100644
index 0000000000..99c717daf3meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +2
-0@@ -0,0 +1,47 @@ +From a337a1ba7d15853fb56deef1f464529af6e3a1cf Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin <[email protected]>Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +8
-0+Date: Mon, 23 Oct 2023 20:29:31 +0000 +Subject: [PATCH] core: reject overly long TXT resource records + +Closes https://github.com/lathiat/avahi/issues/455 + +CVE-2023-38469 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf
]Quoted 17 lines
Quoted 17 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +17
-0+CVE: CVE-2023-38469 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-core/rr.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/avahi-core/rr.c b/avahi-core/rr.c +index 2bb89244..9c04ebbd 100644 +--- a/avahi-core/rr.c ++++ b/avahi-core/rr.c +@@ -32,6 +32,7 @@ + #include <avahi-common/malloc.h> + #include <avahi-common/defs.h> + ++#include "dns.h" + #include "rr.h" + #include "log.h"Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +8
-0+ #include "util.h" +@@ -689,11 +690,17 @@ int avahi_record_is_valid(AvahiRecord *r) { + case AVAHI_DNS_TYPE_TXT: { + + AvahiStringList *strlst; ++ size_t used = 0; + +- for (strlst = r->data.txt.string_list; strlst; strlst =
strlst->next)Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch line 36
Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +1
-0++ for (strlst = r->data.txt.string_list; strlst; strlst =
strlst->next) {Quoted 4 lines
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +4
-0+ if (strlst->size > 255 || strlst->size <= 0) + return 0; + ++ used += 1+strlst->size;Quoted 8 lines
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +7
-0++ if (used > AVAHI_DNS_RDATA_MAX) ++ return 0; ++ } ++ + return 1; + } + }diff --git
a/meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patchb/meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patchQuoted 7 lines
Quoted 7 lines
new file mode 100644
index 0000000000..b83a70e29bmeta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +2
-0@@ -0,0 +1,65 @@ +From c6cab87df290448a63323c8ca759baa516166237 Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin <[email protected]>Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +8
-0+Date: Wed, 25 Oct 2023 18:15:42 +0000 +Subject: [PATCH] tests: pass overly long TXT resource records + +to make sure they don't crash avahi any more. + +It reproduces https://github.com/lathiat/avahi/issues/455 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237
]Quoted 20 lines
Quoted 20 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +20
-0+CVE: CVE-2023-38469 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-client/client-test.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c +index 7d04a6a..66e3574 100644 +--- a/avahi-client/client-test.c ++++ b/avahi-client/client-test.c +@@ -22,6 +22,7 @@ + #endif + + #include <stdio.h> ++#include <string.h> + #include <assert.h> + + #include <avahi-client/client.h> +@@ -33,6 +34,8 @@ + #include <avahi-common/malloc.h>Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +8
-0+ #include <avahi-common/timeval.h> + ++#include <avahi-core/dns.h> ++ + static const AvahiPoll *poll_api = NULL; + static AvahiSimplePoll *simple_poll = NULL; + +@@ -222,6 +225,9 @@ int main (AVAHI_GCC_UNUSED int argc,
AVAHI_GCC_UNUSEDchar *argv[]) {Quoted 10 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch
Quoted 10 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +10
-0+ uint32_t cookie; + struct timeval tv; + AvahiAddress a; ++ uint8_t rdata[AVAHI_DNS_RDATA_MAX+1]; ++ AvahiStringList *txt = NULL; ++ int r; + + simple_poll = avahi_simple_poll_new(); + poll_api = avahi_simple_poll_get(simple_poll); +@@ -258,6 +264,14 @@ int main (AVAHI_GCC_UNUSED int argc,
AVAHI_GCC_UNUSEDchar *argv[]) {Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch line 49
Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +1
-0+ printf("%s\n", avahi_strerror(avahi_entry_group_add_service(group,
AVAHI_IF_UNSPEC,AVAHI_PROTO_UNSPEC, 0, "Lathiat's Site", "_http._tcp", NULL, NULL, 80, "foo=bar", NULL)));Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch line 50
Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +1
-0+ printf("add_record: %d\n", avahi_entry_group_add_record (group,
AVAHI_IF_UNSPEC,AVAHI_PROTO_UNSPEC, 0, "TestX",0x01,0x10, 120, "\5booya", 6));Quoted 5 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch
Quoted 5 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +5
-0+ ++ memset(rdata, 1, sizeof(rdata)); ++ r = avahi_string_list_parse(rdata, sizeof(rdata), &txt); ++ assert(r >= 0); ++ assert(avahi_string_list_serialize(txt, NULL, 0) ==sizeof(rdata));
Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch line 56
Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +1
-0++ error = avahi_entry_group_add_service_strlst(group,
AVAHI_IF_UNSPEC,AVAHI_PROTO_UNSPEC, 0, "TestX", "_qotd._tcp", NULL, NULL, 123, txt);Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch
Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +6
-0++ assert(error == AVAHI_ERR_INVALID_RECORD); ++ avahi_string_list_free(txt); ++ + avahi_entry_group_commit (group); + + domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC,
AVAHI_PROTO_UNSPEC, NULL,AVAHI_DOMAIN_BROWSER_BROWSE, 0,avahi_domain_browser_callback, (char*) "omghai3u");Quoted 4 lines
Review
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +3
-0+-- +2.25.1 +(quoted diff) +0
-0
b/meta/recipes-connectivity/avahi/files/CVE-2023-38470.patchQuoted 8 lines
Quoted 8 lines
new file mode 100644
index 0000000000..1cbb00dcabmeta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +3
-0@@ -0,0 +1,56 @@ +From 94cb6489114636940ac683515417990b55b5d66c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <[email protected]> +Date: Tue, 11 Apr 2023 15:29:59 +0200Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +8
-0+Subject: [PATCH] Ensure each label is at least one byte long + +The only allowed exception is single dot, where it should return empty +string. + +Fixes #454. + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c
]Quoted 4 lines
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +4
-0+CVE: CVE-2023-38470 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-common/domain-test.c | 14 ++++++++++++++Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +8
-0+ avahi-common/domain.c | 2 +- + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/avahi-common/domain-test.c b/avahi-common/domain-test.c +index cf763eca6..3acc1c1e4 100644 +--- a/avahi-common/domain-test.c ++++ b/avahi-common/domain-test.c +@@ -45,6 +45,20 @@ int main(AVAHI_GCC_UNUSED int argc,
AVAHI_GCC_UNUSEDchar *argv[]) {Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch line 24
Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +1
-0+ printf("%s\n", s = avahi_normalize_name_strdup("fo\\\\o\\..foo."));
Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch
Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +6
-0+ avahi_free(s); + ++ printf("%s\n", s = avahi_normalize_name_strdup(".")); ++ avahi_free(s); ++ ++ s =avahi_normalize_name_strdup(",.=.}.=.?-.}.=.?.?.}.}.?.?.?.z.?.?.}.}."
Quoted 11 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch
Quoted 11 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +11
-0++ "}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.}.}.}" ++ ".?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.?.zM.?`" ++ "?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}??.}.}.?.?." ++ "?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.?`?.}.}.}." ++ "??.?.zM.?`?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}?" ++ "?.}.}.?.?.?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM." ++ "?`?.}.}.}.?.?.?.r.=.=.?.?`.?.?}.}.}.?.?.?.r.=.?.}.=.?.?." ++ "}.?.?.?.}.=.?.?.}"); ++ assert(s == NULL); ++ + printf("%i\n", avahi_domain_equal("\\065aabbb\\.\\046cc.cc\\\\.dee.fff.", "Aaa BBB\\.\\.cc.cc\\\\.dee.fff"));
Quoted 7 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch
Quoted 7 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +7
-0+ printf("%i\n", avahi_domain_equal("A", "a")); + +diff --git a/avahi-common/domain.c b/avahi-common/domain.c +index 3b1ab6834..e66d2416c 100644 +--- a/avahi-common/domain.c ++++ b/avahi-common/domain.c +@@ -201,7 +201,7 @@ char *avahi_normalize_name(const char *s, char
*ret_s,size_tsize) {Quoted 9 lines
Review
Quoted 9 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +8
-0+ } + + if (!empty) { +- if (size < 1) ++ if (size < 2) + return NULL; + + *(r++) = '.';(quoted diff) +0
-0
b/meta/recipes-connectivity/avahi/files/CVE-2023-38471.patchQuoted 12 lines
Quoted 12 lines
new file mode 100644
index 0000000000..8242646da1meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +7
-0@@ -0,0 +1,72 @@ +From 894f085f402e023a98cbb6f5a3d117bd88d93b09 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]> +Date: Mon, 23 Oct 2023 13:38:35 +0200 +Subject: [PATCH] core: extract host name using avahi_unescape_label() + +Previously we could create invalid escape sequence when we split the +string on dot. For example, from valid host name "foo\\.bar" we haveQuoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +8
-0+created invalid name "foo\\" and tried to set that as the host name +which crashed the daemon. + +Fixes #453 + +CVE-2023-38471 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09
]Quoted 6 lines
Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +6
-0+CVE: CVE-2023-38471 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-core/server.c | 27 +++++++++++++++++++++------ + 1 file changed, 21 insertions(+), 6 deletions(-) +Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +8
-0+diff --git a/avahi-core/server.c b/avahi-core/server.c +index c32637af8..f6a21bb77 100644 +--- a/avahi-core/server.c ++++ b/avahi-core/server.c +@@ -1295,7 +1295,11 @@ static void update_fqdn(AvahiServer *s) { + } + + int avahi_server_set_host_name(AvahiServer *s, const char *host_name){
Quoted 9 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch
Quoted 9 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +9
-0+- char *hn = NULL; ++ char label_escaped[AVAHI_LABEL_MAX*4+1]; ++ char label[AVAHI_LABEL_MAX]; ++ char *hn = NULL, *h; ++ size_t len; ++ + assert(s); + + AVAHI_CHECK_VALIDITY(s, !host_name ||
avahi_is_valid_host_name(host_name),AVAHI_ERR_INVALID_HOST_NAME);Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch line 39
Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +1
-0+@@ -1305,17 +1309,28 @@ int avahi_server_set_host_name(AvahiServer *s,const char
*host_name) {Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch
Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +6
-0+ else + hn = avahi_normalize_name_strdup(host_name); + +- hn[strcspn(hn, ".")] = 0; ++ h = hn; ++ if (!avahi_unescape_label((const char **)&hn, label,sizeof(label))) {
Quoted 4 lines
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +4
-0++ avahi_free(h); ++ return AVAHI_ERR_INVALID_HOST_NAME; ++ } ++Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +8
-0++ avahi_free(h); ++ ++ h = label_escaped; ++ len = sizeof(label_escaped); ++ if (!avahi_escape_label(label, strlen(label), &h, &len)) ++ return AVAHI_ERR_INVALID_HOST_NAME; + +- if (avahi_domain_equal(s->host_name, hn) && s->state !=
AVAHI_SERVER_COLLISION) {Quoted 2 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch line 59
Quoted 2 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +2
-0+- avahi_free(hn); ++ if (avahi_domain_equal(s->host_name, label_escaped) && s->state!=
AVAHI_SERVER_COLLISION)Quoted 6 lines
Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +6
-0+ return avahi_server_set_errno(s, AVAHI_ERR_NO_CHANGE); +- } + + withdraw_host_rrs(s); + + avahi_free(s->host_name);Quoted 8 lines
Review
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +7
-0+- s->host_name = hn; ++ s->host_name = avahi_strdup(label_escaped); ++ if (!s->host_name) ++ return AVAHI_ERR_NO_MEMORY; + + update_fqdn(s); +(quoted diff) +0
-0
b/meta/recipes-connectivity/avahi/files/CVE-2023-38472.patchQuoted 9 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch line 4
Quoted 9 lines
new file mode 100644
index 0000000000..43b26c1132meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +4
-0@@ -0,0 +1,47 @@ +From b024ae5749f4aeba03478e6391687c3c9c8dee40 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]> +Date: Thu, 19 Oct 2023 17:36:44 +0200 +Subject: [PATCH] core: make sure there is rdata to process beforeparsing it
Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch
Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +6
-0+ +Fixes #452 + +CVE-2023-38472 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40
]Quoted 4 lines
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +4
-0+CVE: CVE-2023-38472 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-client/client-test.c | 3 +++Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +8
-0+ avahi-daemon/dbus-entry-group.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c +index 66e3574..9a015d7 100644 +--- a/avahi-client/client-test.c ++++ b/avahi-client/client-test.c +@@ -272,6 +272,9 @@ int main (AVAHI_GCC_UNUSED int argc,
AVAHI_GCC_UNUSEDchar *argv[]) {Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +4
-0+ assert(error == AVAHI_ERR_INVALID_RECORD); + avahi_string_list_free(txt); + ++ error = avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC,
AVAHI_PROTO_UNSPEC, 0, "TestX",0x01,0x10, 120, "", 0);Quoted 5 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch
Quoted 5 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +5
-0++ assert(error != AVAHI_OK); ++ + avahi_entry_group_commit (group); + + domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC,
AVAHI_PROTO_UNSPEC, NULL,AVAHI_DOMAIN_BROWSER_BROWSE, 0,avahi_domain_browser_callback, (char*) "omghai3u");Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch line 32
Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +1
-0+diff --git a/avahi-daemon/dbus-entry-group.c
b/avahi-daemon/dbus-entry-group.cQuoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +4
-0+index 4e879a5..aa23d4b 100644 +--- a/avahi-daemon/dbus-entry-group.c ++++ b/avahi-daemon/dbus-entry-group.c +@@ -340,7 +340,7 @@ DBusHandlerResultavahi_dbus_msg_entry_group_impl(DBusConnection *c, DBusMessage
Quoted 2 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch line 38
Quoted 2 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +2
-0+ if (!(r = avahi_record_new_full (name, clazz, type, ttl))) + return avahi_dbus_respond_error(c, m,
AVAHI_ERR_NO_MEMORY, NULL);Quoted 5 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch
Quoted 5 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +5
-0+ +- if (avahi_rdata_parse (r, rdata, size) < 0) { ++ if (!rdata || avahi_rdata_parse (r, rdata, size) < 0) { + avahi_record_unref (r); + return avahi_dbus_respond_error(c, m,
AVAHI_ERR_INVALID_RDATA, NULL);Quoted 5 lines
Review
Quoted 5 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +4
-0+ } +-- +2.25.1 +(quoted diff) +0
-0
b/meta/recipes-connectivity/avahi/files/CVE-2023-38473.patchQuoted 9 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch line 4
Quoted 9 lines
new file mode 100644
index 0000000000..7b33d564f8meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +4
-0@@ -0,0 +1,108 @@ +From b448c9f771bada14ae8de175695a9729f8646797 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]> +Date: Wed, 11 Oct 2023 17:45:44 +0200 +Subject: [PATCH] common: derive alternative host name from itsunescaped
Quoted 9 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch
Quoted 9 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +9
-0+ version + +Normalization of input makes sure we don't have to deal with special +cases like unescaped dot at the end of label. + +Fixes #451 #487 +CVE-2023-38473 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797
]Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +8
-0+CVE: CVE-2023-38473 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-common/alternative-test.c | 3 +++ + avahi-common/alternative.c | 27 +++++++++++++++++++-------- + 2 files changed, 22 insertions(+), 8 deletions(-) + +diff --git a/avahi-common/alternative-test.c
b/avahi-common/alternative-test.cQuoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +4
-0+index 9255435ec..681fc15b8 100644 +--- a/avahi-common/alternative-test.c ++++ b/avahi-common/alternative-test.c +@@ -31,6 +31,9 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSEDchar *argv[]) {
Quoted 2 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch line 41
Quoted 2 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +2
-0+ const char* const test_strings[] = { +"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch line 57
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +4
-0+ "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXüüüüüüü", ++ ").", ++ "\\.", ++"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\\\\",
Quoted 75 lines
Quoted 75 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +75
-0+ "gurke", + "-", + " #", +diff --git a/avahi-common/alternative.c b/avahi-common/alternative.c +index b3d39f0ed..a094e6d76 100644 +--- a/avahi-common/alternative.c ++++ b/avahi-common/alternative.c +@@ -49,15 +49,20 @@ static void drop_incomplete_utf8(char *c) { + } + + char *avahi_alternative_host_name(const char *s) { ++ char label[AVAHI_LABEL_MAX], alternative[AVAHI_LABEL_MAX*4+1]; ++ char *alt, *r, *ret; + const char *e; +- char *r; ++ size_t len; + + assert(s); + + if (!avahi_is_valid_host_name(s)) + return NULL; + +- if ((e = strrchr(s, '-'))) { ++ if (!avahi_unescape_label(&s, label, sizeof(label))) ++ return NULL; ++ ++ if ((e = strrchr(label, '-'))) { + const char *p; + + e++; +@@ -74,19 +79,18 @@ char *avahi_alternative_host_name(const char *s) { + + if (e) { + char *c, *m; +- size_t l; + int n; + + n = atoi(e)+1; + if (!(m = avahi_strdup_printf("%i", n))) + return NULL; + +- l = e-s-1; ++ len = e-label-1; + +- if (l >= AVAHI_LABEL_MAX-1-strlen(m)-1) +- l = AVAHI_LABEL_MAX-1-strlen(m)-1; ++ if (len >= AVAHI_LABEL_MAX-1-strlen(m)-1) ++ len = AVAHI_LABEL_MAX-1-strlen(m)-1; + +- if (!(c = avahi_strndup(s, l))) { ++ if (!(c = avahi_strndup(label, len))) { + avahi_free(m); + return NULL; + } +@@ -100,7 +104,7 @@ char *avahi_alternative_host_name(const char *s) { + } else { + char *c; + +- if (!(c = avahi_strndup(s, AVAHI_LABEL_MAX-1-2))) ++ if (!(c = avahi_strndup(label, AVAHI_LABEL_MAX-1-2))) + return NULL; + + drop_incomplete_utf8(c); +@@ -109,6 +113,13 @@ char *avahi_alternative_host_name(const char *s) { + avahi_free(c); + } + ++ alt = alternative; ++ len = sizeof(alternative); ++ ret = avahi_escape_label(r, strlen(r), &alt, &len); ++ ++ avahi_free(r); ++ r = avahi_strdup(ret); ++ + assert(avahi_is_valid_host_name(r));Quoted 11 lines
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +2
-1+ + return r; --2.25.1
--
Jeremy Puhlman
[email protected]-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#190798):
https://lists.openembedded.org/g/openembedded-core/message/190798
Mute This Topic: https://lists.openembedded.org/mt/102621335/7301997
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Hi Ross,
As discussed with Vijay, we'll cooperate on this CVE fixes.
Regards
Meenali
________________________________
From: Vijay Anusuri <[email protected]>
Sent: 16 November 2023 21:31
To: [email protected] <[email protected]>; Ross Burton <[email protected]>; Gupta, Meenali <[email protected]>
Cc: [email protected] <[email protected]>
Subject: Re: [OE-core][kirkstone][PATCH] avahi: Fix for multiple CVE's
CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe. Hi Ross,
As discussed with Meenali, I agreed she was going to do this work.
She has already submitted patches for multiple branches ( master, mickledore and kirkstone ).
For CVE-2023-38469, we need to include 2 commits to fix the CVE. Meenali will send the v2 patch for CVE-2023-38469 which will include 2 patches for all the branches.
Thank you Meenali for your timely response.
Thanks & Regards,
Vijay
On Thu, Nov 16, 2023 at 7:56 PM Jeremy Puhlman via lists.openembedded.org<https://urldefense.com/v3/__http://lists.openembedded.org__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPwKv5R-0$> <[email protected]<mailto:[email protected]>> wrote:
Quoted 3 lines · Ross Burton
Hi Vijay and Meenali,
Hopefully this will show everyone - especially WR and Montavista - that we need to communicate better when working on CVEs. In the short term at least, Marta proposed a wiki page which can be updated via a tool and when someone is working on an issue that can be marked to avoid duplication of effort. Would that be acceptable to both of your companies?
Yeah, I think something like that would be great on our end, provided its automated and the data can be extracted, so it can be consolidated in internal CVE tracking that we are currently required to.
Quoted 2 lines
I’ve not checked that the fixes are identical, but apparently I need to remind everyone that we take fixes in *master first* and then backport to the releases in order.
There should also be an agree upon change decoration to indicate non-applicability/differently addressed in earlier releases.
With 4 year LTS releases many issues are just not going to be applicable to master. Also there may well be very good reasons to fix a given set of CVEs in
completely different ways, but making sure they are addressed in both is important. Setting aside this example, in almost all cases on master moving to the fixed version, is almost always the right answer, where as on say dunfell, moving to the new version may have too many knock on effects to make sense.
In this instance, Khem has already indicated moving to the new release may make sense for both kirkstone and master.
Quoted 2 lines
Luckily the avahi recipe is fairly untouched so this should be trivial. Can you both discuss and agree who is going to do this?
Vijay can you work with Meenali to consolidate this patch.
Quoted 489 lines
Ross
Quoted 486 lines
On 16 Nov 2023, at 04:05, Vijay Anusuri via lists.openembedded.org<https://urldefense.com/v3/__http://lists.openembedded.org__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPwKv5R-0$> <[email protected]<mailto:[email protected]>> wrote:
From: Vijay Anusuri <[email protected]<mailto:[email protected]>>
Patches to fix:
CVE-2023-38469
CVE-2023-38470
CVE-2023-38471
CVE-2023-38472
CVE-2023-38473Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPSO96cKo$>
&
https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPlqjXgoU$>
&
https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPRzxTKP8$>
&
https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPwzmpbVo$>
&
https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPOROFOvo$>
&
https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPLLeXBTg$>]---
meta/recipes-connectivity/avahi/avahi_0.8.bb<https://urldefense.com/v3/__http://avahi_0.8.bb__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPSo_Ck9E$> | 6 +.../avahi/files/CVE-2023-38469-1.patch | 47 ++++++++ .../avahi/files/CVE-2023-38469-2.patch | 65 +++++++++++ .../avahi/files/CVE-2023-38470.patch | 56 +++++++++ .../avahi/files/CVE-2023-38471.patch | 72 ++++++++++++ .../avahi/files/CVE-2023-38472.patch | 47 ++++++++ .../avahi/files/CVE-2023-38473.patch | 108 ++++++++++++++++++ 7 files changed, 401 insertions(+)create mode 100644
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38470.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38471.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38472.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38473.patchmeta/recipes-connectivity/avahi/avahi_0.8.bb<https://urldefense.com/v3/__http://avahi_0.8.bb__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPSo_Ck9E$> +6
-0@@ -26,6 +26,12 @@ SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}<https://urldefense.com/v3/__https://github.com/lathiat/avahi/releases/download/v$*7BPV*7D/avahi-$*7BPV*7D__;JSUlJQ!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHP0Am2ovI$> file://0001-Fix-opening-etc-resolv.conf-error.patch \ file://handle-hup.patch \ file://local-ping.patch \ + file://CVE-2023-38469-1.patch \ + file://CVE-2023-38469-2.patch \ + file://CVE-2023-38470.patch \ + file://CVE-2023-38471.patch \ + file://CVE-2023-38472.patch \ + file://CVE-2023-38473.patch \ "
UPSTREAM_CHECK_URI= "https://github.com/lathiat/avahi/releases/<https://urldefense.com/v3/__https://github.com/lathiat/avahi/releases/__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHP0Xuk60k$>"meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +47
-0@@ -0,0 +1,47 @@ +From a337a1ba7d15853fb56deef1f464529af6e3a1cf Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin <[email protected]<mailto:[email protected]>> +Date: Mon, 23 Oct 2023 20:29:31 +0000 +Subject: [PATCH] core: reject overly long TXT resource records + +Closes https://github.com/lathiat/avahi/issues/455<https://urldefense.com/v3/__https://github.com/lathiat/avahi/issues/455__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHP-9siEVs$> + +CVE-2023-38469 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPSO96cKo$>] +CVE: CVE-2023-38469 +Signed-off-by: Vijay Anusuri <[email protected]<mailto:[email protected]>> +--- + avahi-core/rr.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/avahi-core/rr.c b/avahi-core/rr.c +index 2bb89244..9c04ebbd 100644 +--- a/avahi-core/rr.c ++++ b/avahi-core/rr.c +@@ -32,6 +32,7 @@ + #include <avahi-common/malloc.h> + #include <avahi-common/defs.h> + ++#include "dns.h" + #include "rr.h" + #include "log.h" + #include "util.h" +@@ -689,11 +690,17 @@ int avahi_record_is_valid(AvahiRecord *r) { + case AVAHI_DNS_TYPE_TXT: { + + AvahiStringList *strlst; ++ size_t used = 0; + +- for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) ++ for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) { + if (strlst->size > 255 || strlst->size <= 0) + return 0; + ++ used += 1+strlst->size; ++ if (used > AVAHI_DNS_RDATA_MAX) ++ return 0; ++ } ++ + return 1; + } + }meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +65
-0@@ -0,0 +1,65 @@ +From c6cab87df290448a63323c8ca759baa516166237 Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin <[email protected]<mailto:[email protected]>> +Date: Wed, 25 Oct 2023 18:15:42 +0000 +Subject: [PATCH] tests: pass overly long TXT resource records + +to make sure they don't crash avahi any more. + +It reproduces https://github.com/lathiat/avahi/issues/455<https://urldefense.com/v3/__https://github.com/lathiat/avahi/issues/455__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHP-9siEVs$> + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPlqjXgoU$>] +CVE: CVE-2023-38469 +Signed-off-by: Vijay Anusuri <[email protected]<mailto:[email protected]>> +--- + avahi-client/client-test.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c +index 7d04a6a..66e3574 100644 +--- a/avahi-client/client-test.c ++++ b/avahi-client/client-test.c +@@ -22,6 +22,7 @@ + #endif + + #include <stdio.h> ++#include <string.h> + #include <assert.h> + + #include <avahi-client/client.h> +@@ -33,6 +34,8 @@ + #include <avahi-common/malloc.h> + #include <avahi-common/timeval.h> + ++#include <avahi-core/dns.h> ++ + static const AvahiPoll *poll_api = NULL; + static AvahiSimplePoll *simple_poll = NULL; + +@@ -222,6 +225,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + uint32_t cookie; + struct timeval tv; + AvahiAddress a; ++ uint8_t rdata[AVAHI_DNS_RDATA_MAX+1]; ++ AvahiStringList *txt = NULL; ++ int r; + + simple_poll = avahi_simple_poll_new(); + poll_api = avahi_simple_poll_get(simple_poll); +@@ -258,6 +264,14 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + printf("%s\n", avahi_strerror(avahi_entry_group_add_service (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "Lathiat's Site", "_http._tcp", NULL, NULL, 80, "foo=bar", NULL))); + printf("add_record: %d\n", avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "\5booya", 6)); + ++ memset(rdata, 1, sizeof(rdata)); ++ r = avahi_string_list_parse(rdata, sizeof(rdata), &txt); ++ assert(r >= 0); ++ assert(avahi_string_list_serialize(txt, NULL, 0) == sizeof(rdata)); ++ error = avahi_entry_group_add_service_strlst(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", "_qotd._tcp", NULL, NULL, 123, txt); ++ assert(error == AVAHI_ERR_INVALID_RECORD); ++ avahi_string_list_free(txt); ++ + avahi_entry_group_commit (group); + + domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, avahi_domain_browser_callback, (char*) "omghai3u"); +-- +2.25.1 +meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +56
-0@@ -0,0 +1,56 @@ +From 94cb6489114636940ac683515417990b55b5d66c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <[email protected]<mailto:[email protected]>> +Date: Tue, 11 Apr 2023 15:29:59 +0200 +Subject: [PATCH] Ensure each label is at least one byte long + +The only allowed exception is single dot, where it should return empty +string. + +Fixes #454. + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPRzxTKP8$>] +CVE: CVE-2023-38470 +Signed-off-by: Vijay Anusuri <[email protected]<mailto:[email protected]>> +--- + avahi-common/domain-test.c | 14 ++++++++++++++ + avahi-common/domain.c | 2 +- + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/avahi-common/domain-test.c b/avahi-common/domain-test.c +index cf763eca6..3acc1c1e4 100644 +--- a/avahi-common/domain-test.c ++++ b/avahi-common/domain-test.c +@@ -45,6 +45,20 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + printf("%s\n", s = avahi_normalize_name_strdup("fo\\\\o\\..f oo.")); + avahi_free(s); + ++ printf("%s\n", s = avahi_normalize_name_strdup(".")); ++ avahi_free(s); ++ ++ s = avahi_normalize_name_strdup(",.=.}.=.?-.}.=.?.?.}.}.?.?.?.z.?.?.}.}." ++ "}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.}.}.}" ++ ".?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.?.zM.?`" ++ "?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}??.}.}.?.?." ++ "?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.?`?.}.}.}." ++ "??.?.zM.?`?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}?" ++ "?.}.}.?.?.?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM." ++ "?`?.}.}.}.?.?.?.r.=.=.?.?`.?.?}.}.}.?.?.?.r.=.?.}.=.?.?." ++ "}.?.?.?.}.=.?.?.}"); ++ assert(s == NULL); ++ + printf("%i\n", avahi_domain_equal("\\065aa bbb\\.\\046cc.cc\\\\.dee.fff.", "Aaa BBB\\.\\.cc.cc\\\\.dee.fff")); + printf("%i\n", avahi_domain_equal("A", "a")); + +diff --git a/avahi-common/domain.c b/avahi-common/domain.c +index 3b1ab6834..e66d2416c 100644 +--- a/avahi-common/domain.c ++++ b/avahi-common/domain.c +@@ -201,7 +201,7 @@ char *avahi_normalize_name(const char *s, char *ret_s, size_t size) { + } + + if (!empty) { +- if (size < 1) ++ if (size < 2) + return NULL; + + *(r++) = '.';meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +72
-0@@ -0,0 +1,72 @@ +From 894f085f402e023a98cbb6f5a3d117bd88d93b09 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]<mailto:[email protected]>> +Date: Mon, 23 Oct 2023 13:38:35 +0200 +Subject: [PATCH] core: extract host name using avahi_unescape_label() + +Previously we could create invalid escape sequence when we split the +string on dot. For example, from valid host name "foo\\.bar" we have +created invalid name "foo\\" and tried to set that as the host name +which crashed the daemon. + +Fixes #453 + +CVE-2023-38471 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPwzmpbVo$>] +CVE: CVE-2023-38471 +Signed-off-by: Vijay Anusuri <[email protected]<mailto:[email protected]>> +--- + avahi-core/server.c | 27 +++++++++++++++++++++------ + 1 file changed, 21 insertions(+), 6 deletions(-) + +diff --git a/avahi-core/server.c b/avahi-core/server.c +index c32637af8..f6a21bb77 100644 +--- a/avahi-core/server.c ++++ b/avahi-core/server.c +@@ -1295,7 +1295,11 @@ static void update_fqdn(AvahiServer *s) { + } + + int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { +- char *hn = NULL; ++ char label_escaped[AVAHI_LABEL_MAX*4+1]; ++ char label[AVAHI_LABEL_MAX]; ++ char *hn = NULL, *h; ++ size_t len; ++ + assert(s); + + AVAHI_CHECK_VALIDITY(s, !host_name || avahi_is_valid_host_name(host_name), AVAHI_ERR_INVALID_HOST_NAME); +@@ -1305,17 +1309,28 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { + else + hn = avahi_normalize_name_strdup(host_name); + +- hn[strcspn(hn, ".")] = 0; ++ h = hn; ++ if (!avahi_unescape_label((const char **)&hn, label, sizeof(label))) { ++ avahi_free(h); ++ return AVAHI_ERR_INVALID_HOST_NAME; ++ } ++ ++ avahi_free(h); ++ ++ h = label_escaped; ++ len = sizeof(label_escaped); ++ if (!avahi_escape_label(label, strlen(label), &h, &len)) ++ return AVAHI_ERR_INVALID_HOST_NAME; + +- if (avahi_domain_equal(s->host_name, hn) && s->state != AVAHI_SERVER_COLLISION) { +- avahi_free(hn); ++ if (avahi_domain_equal(s->host_name, label_escaped) && s->state != AVAHI_SERVER_COLLISION) + return avahi_server_set_errno(s, AVAHI_ERR_NO_CHANGE); +- } + + withdraw_host_rrs(s); + + avahi_free(s->host_name); +- s->host_name = hn; ++ s->host_name = avahi_strdup(label_escaped); ++ if (!s->host_name) ++ return AVAHI_ERR_NO_MEMORY; + + update_fqdn(s); +meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +47
-0@@ -0,0 +1,47 @@ +From b024ae5749f4aeba03478e6391687c3c9c8dee40 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]<mailto:[email protected]>> +Date: Thu, 19 Oct 2023 17:36:44 +0200 +Subject: [PATCH] core: make sure there is rdata to process before parsing it + +Fixes #452 + +CVE-2023-38472 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPOROFOvo$>] +CVE: CVE-2023-38472 +Signed-off-by: Vijay Anusuri <[email protected]<mailto:[email protected]>> +--- + avahi-client/client-test.c | 3 +++ + avahi-daemon/dbus-entry-group.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c +index 66e3574..9a015d7 100644 +--- a/avahi-client/client-test.c ++++ b/avahi-client/client-test.c +@@ -272,6 +272,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + assert(error == AVAHI_ERR_INVALID_RECORD); + avahi_string_list_free(txt); + ++ error = avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "", 0); ++ assert(error != AVAHI_OK); ++ + avahi_entry_group_commit (group); + + domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, avahi_domain_browser_callback, (char*) "omghai3u"); +diff --git a/avahi-daemon/dbus-entry-group.c b/avahi-daemon/dbus-entry-group.c +index 4e879a5..aa23d4b 100644 +--- a/avahi-daemon/dbus-entry-group.c ++++ b/avahi-daemon/dbus-entry-group.c +@@ -340,7 +340,7 @@ DBusHandlerResult avahi_dbus_msg_entry_group_impl(DBusConnection *c, DBusMessage + if (!(r = avahi_record_new_full (name, clazz, type, ttl))) + return avahi_dbus_respond_error(c, m, AVAHI_ERR_NO_MEMORY, NULL); + +- if (avahi_rdata_parse (r, rdata, size) < 0) { ++ if (!rdata || avahi_rdata_parse (r, rdata, size) < 0) { + avahi_record_unref (r); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_INVALID_RDATA, NULL); + } +-- +2.25.1 +meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +106
-0@@ -0,0 +1,108 @@ +From b448c9f771bada14ae8de175695a9729f8646797 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]<mailto:[email protected]>> +Date: Wed, 11 Oct 2023 17:45:44 +0200 +Subject: [PATCH] common: derive alternative host name from its unescaped + version + +Normalization of input makes sure we don't have to deal with special +cases like unescaped dot at the end of label. + +Fixes #451 #487 +CVE-2023-38473 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPLLeXBTg$>] +CVE: CVE-2023-38473 +Signed-off-by: Vijay Anusuri <[email protected]<mailto:[email protected]>> +--- + avahi-common/alternative-test.c | 3 +++ + avahi-common/alternative.c | 27 +++++++++++++++++++-------- + 2 files changed, 22 insertions(+), 8 deletions(-) + +diff --git a/avahi-common/alternative-test.c b/avahi-common/alternative-test.c +index 9255435ec..681fc15b8 100644 +--- a/avahi-common/alternative-test.c ++++ b/avahi-common/alternative-test.c +@@ -31,6 +31,9 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + const char* const test_strings[] = { + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXüüüüüüü", ++ ").", ++ "\\.", ++ "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\\\\", + "gurke", + "-", + " #", +diff --git a/avahi-common/alternative.c b/avahi-common/alternative.c +index b3d39f0ed..a094e6d76 100644 +--- a/avahi-common/alternative.c ++++ b/avahi-common/alternative.c +@@ -49,15 +49,20 @@ static void drop_incomplete_utf8(char *c) { + } + + char *avahi_alternative_host_name(const char *s) { ++ char label[AVAHI_LABEL_MAX], alternative[AVAHI_LABEL_MAX*4+1]; ++ char *alt, *r, *ret; + const char *e; +- char *r; ++ size_t len; + + assert(s); + + if (!avahi_is_valid_host_name(s)) + return NULL; + +- if ((e = strrchr(s, '-'))) { ++ if (!avahi_unescape_label(&s, label, sizeof(label))) ++ return NULL; ++ ++ if ((e = strrchr(label, '-'))) { + const char *p; + + e++; +@@ -74,19 +79,18 @@ char *avahi_alternative_host_name(const char *s) { + + if (e) { + char *c, *m; +- size_t l; + int n; + + n = atoi(e)+1; + if (!(m = avahi_strdup_printf("%i", n))) + return NULL; + +- l = e-s-1; ++ len = e-label-1; + +- if (l >= AVAHI_LABEL_MAX-1-strlen(m)-1) +- l = AVAHI_LABEL_MAX-1-strlen(m)-1; ++ if (len >= AVAHI_LABEL_MAX-1-strlen(m)-1) ++ len = AVAHI_LABEL_MAX-1-strlen(m)-1; + +- if (!(c = avahi_strndup(s, l))) { ++ if (!(c = avahi_strndup(label, len))) { + avahi_free(m); + return NULL; + } +@@ -100,7 +104,7 @@ char *avahi_alternative_host_name(const char *s) { + } else { + char *c; + +- if (!(c = avahi_strndup(s, AVAHI_LABEL_MAX-1-2))) ++ if (!(c = avahi_strndup(label, AVAHI_LABEL_MAX-1-2))) + return NULL; + + drop_incomplete_utf8(c); +@@ -109,6 +113,13 @@ char *avahi_alternative_host_name(const char *s) { + avahi_free(c); + } + ++ alt = alternative; ++ len = sizeof(alternative); ++ ret = avahi_escape_label(r, strlen(r), &alt, &len); ++ ++ avahi_free(r); ++ r = avahi_strdup(ret); ++ + assert(avahi_is_valid_host_name(r));
Quoted 11 lines
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +2
-1+ + return r; --2.25.1
--
Jeremy Puhlman
[email protected]<mailto:[email protected]>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190798): https://lists.openembedded.org/g/openembedded-core/message/190798<https://urldefense.com/v3/__https://lists.openembedded.org/g/openembedded-core/message/190798__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPHkafzwU$>
Mute This Topic: https://lists.openembedded.org/mt/102621335/7301997<https://urldefense.com/v3/__https://lists.openembedded.org/mt/102621335/7301997__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPxrHyefk$>
Group Owner: [email protected]<mailto:openembedded-core%[email protected]>
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub<https://urldefense.com/v3/__https://lists.openembedded.org/g/openembedded-core/unsub__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPM5Omck4$> [[email protected]<mailto:[email protected]>]
-=-=-=-=-=-=-=-=-=-=-=-
Add Hari who will inform WR developers on his team once the CVE co-ordination scheme is available. Add Marta.
Quoted 3 lines · Meenali Gupta via lists.openembedded.org
Hi Ross,
As discussed with Vijay, we'll cooperate on this CVE fixes.
Marta,
Do you have a wiki page set-up?
I see:
https://wiki.yoctoproject.org/wiki/Synchronization_CVEs
and it mentions, but does not point to, "A synchronization wiki page".
../Randy
Quoted 709 lines
Regards
Meenali
------------------------------------------------------------------------
*From:* Vijay Anusuri <[email protected]>
*Sent:* 16 November 2023 21:31
*To:* [email protected] <[email protected]>; Ross Burton <[email protected]>; Gupta, Meenali <[email protected]> *Cc:* [email protected] <[email protected]>
*Subject:* Re: [OE-core][kirkstone][PATCH] avahi: Fix for multiple CVE's
**
*CAUTION: This email comes from a non Wind River email account!*
Do not click links or open attachments unless you recognize the sender and know the content is safe.
Hi Ross,As discussed with Meenali, I agreed she was going to do this work.
She has already submitted patches for multiple branches ( master, mickledore and kirkstone ).For CVE-2023-38469, we need to include 2 commits to fix the CVE. Meenali will send the v2 patch for CVE-2023-38469 which will include 2 patches for all the branches.
Thank you Meenali for your timely response.
Thanks & Regards,
VijayOn Thu, Nov 16, 2023 at 7:56 PM Jeremy Puhlman via lists.openembedded.org <https://urldefense.com/v3/__http://lists.openembedded.org__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPwKv5R-0$> <[email protected]> wrote:
On 11/16/2023 3:22 AM, Ross Burton wrote: > Hi Vijay and Meenali, > > Hopefully this will show everyone - especially WR and Montavista - that we need to communicate better when working on CVEs. In the short term at least, Marta proposed a wiki page which can be updated via a tool and when someone is working on an issue that can be marked to avoid duplication of effort. Would that be acceptable to both of your companies? Yeah, I think something like that would be great on our end, provided its automated and the data can be extracted, so it can be consolidated in internal CVE tracking that we are currently required to. > > I’ve not checked that the fixes are identical, but apparently I need to remind everyone that we take fixes in *master first* and then backport to the releases in order. There should also be an agree upon change decoration to indicate non-applicability/differently addressed in earlier releases. With 4 year LTS releases many issues are just not going to be applicable to master. Also there may well be very good reasons to fix a given set of CVEs in completely different ways, but making sure they are addressed in both is important. Setting aside this example, in almost all cases on master moving to the fixed version, is almost always the right answer, where as on say dunfell, moving to the new version may have too many knock on effects to make sense. In this instance, Khem has already indicated moving to the new release may make sense for both kirkstone and master. > > Luckily the avahi recipe is fairly untouched so this should be trivial. Can you both discuss and agree who is going to do this? Vijay can you work with Meenali to consolidate this patch. > > Ross > >> On 16 Nov 2023, at 04:05, Vijay Anusuri via lists.openembedded.org <https://urldefense.com/v3/__http://lists.openembedded.org__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPwKv5R-0$> <[email protected]> wrote: >> >> From: Vijay Anusuri <[email protected]> >> >> Patches to fix: >> CVE-2023-38469 >> CVE-2023-38470 >> CVE-2023-38471 >> CVE-2023-38472 >> CVE-2023-38473 >> >> Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf <https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPSO96cKo$> >> & >> https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237 <https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPlqjXgoU$> >> & >> https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c <https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPRzxTKP8$> >> & >> https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09 <https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPwzmpbVo$> >> & >> https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40 <https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPOROFOvo$> >> & >> https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797 <https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPLLeXBTg$>] >> >> Signed-off-by: Vijay Anusuri <[email protected]> >> --- >> meta/recipes-connectivity/avahi/avahi_0.8.bb <https://urldefense.com/v3/__http://avahi_0.8.bb__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPSo_Ck9E$> | 6 + >> .../avahi/files/CVE-2023-38469-1.patch | 47 ++++++++ >> .../avahi/files/CVE-2023-38469-2.patch | 65 +++++++++++ >> .../avahi/files/CVE-2023-38470.patch | 56 +++++++++ >> .../avahi/files/CVE-2023-38471.patch | 72 ++++++++++++ >> .../avahi/files/CVE-2023-38472.patch | 47 ++++++++ >> .../avahi/files/CVE-2023-38473.patch | 108 ++++++++++++++++++ >> 7 files changed, 401 insertions(+) >> create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch >> create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch >> create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch >> create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch >> create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch >> create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch >> >> diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb <https://urldefense.com/v3/__http://avahi_0.8.bb__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPSo_Ck9E$> b/meta/recipes-connectivity/avahi/avahi_0.8.bb <https://urldefense.com/v3/__http://avahi_0.8.bb__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPSo_Ck9E$> >> index b5c966c102..772fb43939 100644 >> --- a/meta/recipes-connectivity/avahi/avahi_0.8.bb <https://urldefense.com/v3/__http://avahi_0.8.bb__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPSo_Ck9E$> >> +++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb <https://urldefense.com/v3/__http://avahi_0.8.bb__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPSo_Ck9E$> >> @@ -26,6 +26,12 @@ SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV} <https://urldefense.com/v3/__https://github.com/lathiat/avahi/releases/download/v$*7BPV*7D/avahi-$*7BPV*7D__;JSUlJQ!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHP0Am2ovI$> >> file://0001-Fix-opening-etc-resolv.conf-error.patch \ >> file://handle-hup.patch \ >> file://local-ping.patch \ >> + file://CVE-2023-38469-1.patch \ >> + file://CVE-2023-38469-2.patch \ >> + file://CVE-2023-38470.patch \ >> + file://CVE-2023-38471.patch \ >> + file://CVE-2023-38472.patch \ >> + file://CVE-2023-38473.patch \ >> " >> >> UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/ <https://urldefense.com/v3/__https://github.com/lathiat/avahi/releases/__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHP0Xuk60k$>" >> diff --git a/meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch b/meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch >> new file mode 100644 >> index 0000000000..99c717daf3 >> --- /dev/null >> +++ b/meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch >> @@ -0,0 +1,47 @@ >> +From a337a1ba7d15853fb56deef1f464529af6e3a1cf Mon Sep 17 00:00:00 2001 >> +From: Evgeny Vereshchagin <[email protected]> >> +Date: Mon, 23 Oct 2023 20:29:31 +0000 >> +Subject: [PATCH] core: reject overly long TXT resource records >> + >> +Closes https://github.com/lathiat/avahi/issues/455 <https://urldefense.com/v3/__https://github.com/lathiat/avahi/issues/455__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHP-9siEVs$> >> + >> +CVE-2023-38469 >> + >> +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf <https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPSO96cKo$>] >> +CVE: CVE-2023-38469 >> +Signed-off-by: Vijay Anusuri <[email protected]> >> +--- >> + avahi-core/rr.c | 9 ++++++++- >> + 1 file changed, 8 insertions(+), 1 deletion(-) >> + >> +diff --git a/avahi-core/rr.c b/avahi-core/rr.c >> +index 2bb89244..9c04ebbd 100644 >> +--- a/avahi-core/rr.c >> ++++ b/avahi-core/rr.c >> +@@ -32,6 +32,7 @@ >> + #include <avahi-common/malloc.h> >> + #include <avahi-common/defs.h> >> + >> ++#include "dns.h" >> + #include "rr.h" >> + #include "log.h" >> + #include "util.h" >> +@@ -689,11 +690,17 @@ int avahi_record_is_valid(AvahiRecord *r) { >> + case AVAHI_DNS_TYPE_TXT: { >> + >> + AvahiStringList *strlst; >> ++ size_t used = 0; >> + >> +- for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) >> ++ for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) { >> + if (strlst->size > 255 || strlst->size <= 0) >> + return 0; >> + >> ++ used += 1+strlst->size; >> ++ if (used > AVAHI_DNS_RDATA_MAX) >> ++ return 0; >> ++ } >> ++ >> + return 1; >> + } >> + } >> diff --git a/meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch b/meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch >> new file mode 100644 >> index 0000000000..b83a70e29b >> --- /dev/null >> +++ b/meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch >> @@ -0,0 +1,65 @@ >> +From c6cab87df290448a63323c8ca759baa516166237 Mon Sep 17 00:00:00 2001 >> +From: Evgeny Vereshchagin <[email protected]> >> +Date: Wed, 25 Oct 2023 18:15:42 +0000 >> +Subject: [PATCH] tests: pass overly long TXT resource records >> + >> +to make sure they don't crash avahi any more. >> + >> +It reproduces https://github.com/lathiat/avahi/issues/455 <https://urldefense.com/v3/__https://github.com/lathiat/avahi/issues/455__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHP-9siEVs$> >> + >> +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237 <https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPlqjXgoU$>] >> +CVE: CVE-2023-38469 >> +Signed-off-by: Vijay Anusuri <[email protected]> >> +--- >> + avahi-client/client-test.c | 14 ++++++++++++++ >> + 1 file changed, 14 insertions(+) >> + >> +diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c >> +index 7d04a6a..66e3574 100644 >> +--- a/avahi-client/client-test.c >> ++++ b/avahi-client/client-test.c >> +@@ -22,6 +22,7 @@ >> + #endif >> + >> + #include <stdio.h> >> ++#include <string.h> >> + #include <assert.h> >> + >> + #include <avahi-client/client.h> >> +@@ -33,6 +34,8 @@ >> + #include <avahi-common/malloc.h> >> + #include <avahi-common/timeval.h> >> + >> ++#include <avahi-core/dns.h> >> ++ >> + static const AvahiPoll *poll_api = NULL; >> + static AvahiSimplePoll *simple_poll = NULL; >> + >> +@@ -222,6 +225,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { >> + uint32_t cookie; >> + struct timeval tv; >> + AvahiAddress a; >> ++ uint8_t rdata[AVAHI_DNS_RDATA_MAX+1]; >> ++ AvahiStringList *txt = NULL; >> ++ int r; >> + >> + simple_poll = avahi_simple_poll_new(); >> + poll_api = avahi_simple_poll_get(simple_poll); >> +@@ -258,6 +264,14 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { >> + printf("%s\n", avahi_strerror(avahi_entry_group_add_service (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "Lathiat's Site", "_http._tcp", NULL, NULL, 80, "foo=bar", NULL))); >> + printf("add_record: %d\n", avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "\5booya", 6)); >> + >> ++ memset(rdata, 1, sizeof(rdata)); >> ++ r = avahi_string_list_parse(rdata, sizeof(rdata), &txt); >> ++ assert(r >= 0); >> ++ assert(avahi_string_list_serialize(txt, NULL, 0) == sizeof(rdata)); >> ++ error = avahi_entry_group_add_service_strlst(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", "_qotd._tcp", NULL, NULL, 123, txt); >> ++ assert(error == AVAHI_ERR_INVALID_RECORD); >> ++ avahi_string_list_free(txt); >> ++ >> + avahi_entry_group_commit (group); >> + >> + domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, avahi_domain_browser_callback, (char*) "omghai3u"); >> +-- >> +2.25.1 >> + >> diff --git a/meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch b/meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch >> new file mode 100644 >> index 0000000000..1cbb00dcab >> --- /dev/null >> +++ b/meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch >> @@ -0,0 +1,56 @@ >> +From 94cb6489114636940ac683515417990b55b5d66c Mon Sep 17 00:00:00 2001 >> +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <[email protected]> >> +Date: Tue, 11 Apr 2023 15:29:59 +0200 >> +Subject: [PATCH] Ensure each label is at least one byte long >> + >> +The only allowed exception is single dot, where it should return empty >> +string. >> + >> +Fixes #454. >> + >> +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c <https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPRzxTKP8$>] >> +CVE: CVE-2023-38470 >> +Signed-off-by: Vijay Anusuri <[email protected]> >> +--- >> + avahi-common/domain-test.c | 14 ++++++++++++++ >> + avahi-common/domain.c | 2 +- >> + 2 files changed, 15 insertions(+), 1 deletion(-) >> + >> +diff --git a/avahi-common/domain-test.c b/avahi-common/domain-test.c >> +index cf763eca6..3acc1c1e4 100644 >> +--- a/avahi-common/domain-test.c >> ++++ b/avahi-common/domain-test.c >> +@@ -45,6 +45,20 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { >> + printf("%s\n", s = avahi_normalize_name_strdup("fo\\\\o\\..f oo.")); >> + avahi_free(s); >> + >> ++ printf("%s\n", s = avahi_normalize_name_strdup(".")); >> ++ avahi_free(s); >> ++ >> ++ s = avahi_normalize_name_strdup(",.=.}.=.?-.}.=.?.?.}.}.?.?.?.z.?.?.}.}." >> ++ "}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.}.}.}" >> ++ ".?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.?.zM.?`" >> ++ "?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}??.}.}.?.?." >> ++ "?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.?`?.}.}.}." >> ++ "??.?.zM.?`?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}?" >> ++ "?.}.}.?.?.?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM." >> ++ "?`?.}.}.}.?.?.?.r.=.=.?.?`.?.?}.}.}.?.?.?.r.=.?.}.=.?.?." >> ++ "}.?.?.?.}.=.?.?.}"); >> ++ assert(s == NULL); >> ++ >> + printf("%i\n", avahi_domain_equal("\\065aa bbb\\.\\046cc.cc\\\\.dee.fff.", "Aaa BBB\\.\\.cc.cc\\\\.dee.fff")); >> + printf("%i\n", avahi_domain_equal("A", "a")); >> + >> +diff --git a/avahi-common/domain.c b/avahi-common/domain.c >> +index 3b1ab6834..e66d2416c 100644 >> +--- a/avahi-common/domain.c >> ++++ b/avahi-common/domain.c >> +@@ -201,7 +201,7 @@ char *avahi_normalize_name(const char *s, char *ret_s, size_t size) { >> + } >> + >> + if (!empty) { >> +- if (size < 1) >> ++ if (size < 2) >> + return NULL; >> + >> + *(r++) = '.'; >> diff --git a/meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch b/meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch >> new file mode 100644 >> index 0000000000..8242646da1 >> --- /dev/null >> +++ b/meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch >> @@ -0,0 +1,72 @@ >> +From 894f085f402e023a98cbb6f5a3d117bd88d93b09 Mon Sep 17 00:00:00 2001 >> +From: Michal Sekletar <[email protected]> >> +Date: Mon, 23 Oct 2023 13:38:35 +0200 >> +Subject: [PATCH] core: extract host name using avahi_unescape_label() >> + >> +Previously we could create invalid escape sequence when we split the >> +string on dot. For example, from valid host name "foo\\.bar" we have >> +created invalid name "foo\\" and tried to set that as the host name >> +which crashed the daemon. >> + >> +Fixes #453 >> + >> +CVE-2023-38471 >> + >> +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09 <https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPwzmpbVo$>] >> +CVE: CVE-2023-38471 >> +Signed-off-by: Vijay Anusuri <[email protected]> >> +--- >> + avahi-core/server.c | 27 +++++++++++++++++++++------ >> + 1 file changed, 21 insertions(+), 6 deletions(-) >> + >> +diff --git a/avahi-core/server.c b/avahi-core/server.c >> +index c32637af8..f6a21bb77 100644 >> +--- a/avahi-core/server.c >> ++++ b/avahi-core/server.c >> +@@ -1295,7 +1295,11 @@ static void update_fqdn(AvahiServer *s) { >> + } >> + >> + int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { >> +- char *hn = NULL; >> ++ char label_escaped[AVAHI_LABEL_MAX*4+1]; >> ++ char label[AVAHI_LABEL_MAX]; >> ++ char *hn = NULL, *h; >> ++ size_t len; >> ++ >> + assert(s); >> + >> + AVAHI_CHECK_VALIDITY(s, !host_name || avahi_is_valid_host_name(host_name), AVAHI_ERR_INVALID_HOST_NAME); >> +@@ -1305,17 +1309,28 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { >> + else >> + hn = avahi_normalize_name_strdup(host_name); >> + >> +- hn[strcspn(hn, ".")] = 0; >> ++ h = hn; >> ++ if (!avahi_unescape_label((const char **)&hn, label, sizeof(label))) { >> ++ avahi_free(h); >> ++ return AVAHI_ERR_INVALID_HOST_NAME; >> ++ } >> ++ >> ++ avahi_free(h); >> ++ >> ++ h = label_escaped; >> ++ len = sizeof(label_escaped); >> ++ if (!avahi_escape_label(label, strlen(label), &h, &len)) >> ++ return AVAHI_ERR_INVALID_HOST_NAME; >> + >> +- if (avahi_domain_equal(s->host_name, hn) && s->state != AVAHI_SERVER_COLLISION) { >> +- avahi_free(hn); >> ++ if (avahi_domain_equal(s->host_name, label_escaped) && s->state != AVAHI_SERVER_COLLISION) >> + return avahi_server_set_errno(s, AVAHI_ERR_NO_CHANGE); >> +- } >> + >> + withdraw_host_rrs(s); >> + >> + avahi_free(s->host_name); >> +- s->host_name = hn; >> ++ s->host_name = avahi_strdup(label_escaped); >> ++ if (!s->host_name) >> ++ return AVAHI_ERR_NO_MEMORY; >> + >> + update_fqdn(s); >> + >> diff --git a/meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch b/meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch >> new file mode 100644 >> index 0000000000..43b26c1132 >> --- /dev/null >> +++ b/meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch >> @@ -0,0 +1,47 @@ >> +From b024ae5749f4aeba03478e6391687c3c9c8dee40 Mon Sep 17 00:00:00 2001 >> +From: Michal Sekletar <[email protected]> >> +Date: Thu, 19 Oct 2023 17:36:44 +0200 >> +Subject: [PATCH] core: make sure there is rdata to process before parsing it >> + >> +Fixes #452 >> + >> +CVE-2023-38472 >> + >> +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40 <https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPOROFOvo$>] >> +CVE: CVE-2023-38472 >> +Signed-off-by: Vijay Anusuri <[email protected]> >> +--- >> + avahi-client/client-test.c | 3 +++ >> + avahi-daemon/dbus-entry-group.c | 2 +- >> + 2 files changed, 4 insertions(+), 1 deletion(-) >> + >> +diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c >> +index 66e3574..9a015d7 100644 >> +--- a/avahi-client/client-test.c >> ++++ b/avahi-client/client-test.c >> +@@ -272,6 +272,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { >> + assert(error == AVAHI_ERR_INVALID_RECORD); >> + avahi_string_list_free(txt); >> + >> ++ error = avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "", 0); >> ++ assert(error != AVAHI_OK); >> ++ >> + avahi_entry_group_commit (group); >> + >> + domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, avahi_domain_browser_callback, (char*) "omghai3u"); >> +diff --git a/avahi-daemon/dbus-entry-group.c b/avahi-daemon/dbus-entry-group.c >> +index 4e879a5..aa23d4b 100644 >> +--- a/avahi-daemon/dbus-entry-group.c >> ++++ b/avahi-daemon/dbus-entry-group.c >> +@@ -340,7 +340,7 @@ DBusHandlerResult avahi_dbus_msg_entry_group_impl(DBusConnection *c, DBusMessage >> + if (!(r = avahi_record_new_full (name, clazz, type, ttl))) >> + return avahi_dbus_respond_error(c, m, AVAHI_ERR_NO_MEMORY, NULL); >> + >> +- if (avahi_rdata_parse (r, rdata, size) < 0) { >> ++ if (!rdata || avahi_rdata_parse (r, rdata, size) < 0) { >> + avahi_record_unref (r); >> + return avahi_dbus_respond_error(c, m, AVAHI_ERR_INVALID_RDATA, NULL); >> + } >> +-- >> +2.25.1 >> + >> diff --git a/meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch b/meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch >> new file mode 100644 >> index 0000000000..7b33d564f8 >> --- /dev/null >> +++ b/meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch >> @@ -0,0 +1,108 @@ >> +From b448c9f771bada14ae8de175695a9729f8646797 Mon Sep 17 00:00:00 2001 >> +From: Michal Sekletar <[email protected]> >> +Date: Wed, 11 Oct 2023 17:45:44 +0200 >> +Subject: [PATCH] common: derive alternative host name from its unescaped >> + version >> + >> +Normalization of input makes sure we don't have to deal with special >> +cases like unescaped dot at the end of label. >> + >> +Fixes #451 #487 >> +CVE-2023-38473 >> + >> +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797 <https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPLLeXBTg$>] >> +CVE: CVE-2023-38473 >> +Signed-off-by: Vijay Anusuri <[email protected]> >> +--- >> + avahi-common/alternative-test.c | 3 +++ >> + avahi-common/alternative.c | 27 +++++++++++++++++++-------- >> + 2 files changed, 22 insertions(+), 8 deletions(-) >> + >> +diff --git a/avahi-common/alternative-test.c b/avahi-common/alternative-test.c >> +index 9255435ec..681fc15b8 100644 >> +--- a/avahi-common/alternative-test.c >> ++++ b/avahi-common/alternative-test.c >> +@@ -31,6 +31,9 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { >> + const char* const test_strings[] = { >> + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", >> + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXüüüüüüü", >> ++ ").", >> ++ "\\.", >> ++ "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\\\\", >> + "gurke", >> + "-", >> + " #", >> +diff --git a/avahi-common/alternative.c b/avahi-common/alternative.c >> +index b3d39f0ed..a094e6d76 100644 >> +--- a/avahi-common/alternative.c >> ++++ b/avahi-common/alternative.c >> +@@ -49,15 +49,20 @@ static void drop_incomplete_utf8(char *c) { >> + } >> + >> + char *avahi_alternative_host_name(const char *s) { >> ++ char label[AVAHI_LABEL_MAX], alternative[AVAHI_LABEL_MAX*4+1]; >> ++ char *alt, *r, *ret; >> + const char *e; >> +- char *r; >> ++ size_t len; >> + >> + assert(s); >> + >> + if (!avahi_is_valid_host_name(s)) >> + return NULL; >> + >> +- if ((e = strrchr(s, '-'))) { >> ++ if (!avahi_unescape_label(&s, label, sizeof(label))) >> ++ return NULL; >> ++ >> ++ if ((e = strrchr(label, '-'))) { >> + const char *p; >> + >> + e++; >> +@@ -74,19 +79,18 @@ char *avahi_alternative_host_name(const char *s) { >> + >> + if (e) { >> + char *c, *m; >> +- size_t l; >> + int n; >> + >> + n = atoi(e)+1; >> + if (!(m = avahi_strdup_printf("%i", n))) >> + return NULL; >> + >> +- l = e-s-1; >> ++ len = e-label-1; >> + >> +- if (l >= AVAHI_LABEL_MAX-1-strlen(m)-1) >> +- l = AVAHI_LABEL_MAX-1-strlen(m)-1; >> ++ if (len >= AVAHI_LABEL_MAX-1-strlen(m)-1) >> ++ len = AVAHI_LABEL_MAX-1-strlen(m)-1; >> + >> +- if (!(c = avahi_strndup(s, l))) { >> ++ if (!(c = avahi_strndup(label, len))) { >> + avahi_free(m); >> + return NULL; >> + } >> +@@ -100,7 +104,7 @@ char *avahi_alternative_host_name(const char *s) { >> + } else { >> + char *c; >> + >> +- if (!(c = avahi_strndup(s, AVAHI_LABEL_MAX-1-2))) >> ++ if (!(c = avahi_strndup(label, AVAHI_LABEL_MAX-1-2))) >> + return NULL; >> + >> + drop_incomplete_utf8(c); >> +@@ -109,6 +113,13 @@ char *avahi_alternative_host_name(const char *s) { >> + avahi_free(c); >> + } >> + >> ++ alt = alternative; >> ++ len = sizeof(alternative); >> ++ ret = avahi_escape_label(r, strlen(r), &alt, &len); >> ++ >> ++ avahi_free(r); >> ++ r = avahi_strdup(ret); >> ++ >> + assert(avahi_is_valid_host_name(r)); >> + >> + return r; >> -- >> 2.25.1 >> >> >> >> > > > -- Jeremy Puhlman [email protected]-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190851):https://lists.openembedded.org/g/openembedded-core/message/190851 Mute This Topic:https://lists.openembedded.org/mt/102621335/3616765
Group Owner:[email protected] Unsubscribe:https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 2 lines
# Randy MacLeod # Wind River Linux
Hi Ross and Steve,
Please consider this patch for the Kirkstone branch.
As discussed again with Meenali, I will be sending patches to remaining branches.
Thanks & Regards,
Vijay
Quoted 722 lines · Randy MacLeod
Add Hari who will inform WR developers on his team once the CVE co-ordination scheme is available.
Add Marta.On 2023-11-17 9:11 a.m., Meenali Gupta via lists.openembedded.org wrote:
Hi Ross,
As discussed with Vijay, we'll cooperate on this CVE fixes.
Marta,
Do you have a wiki page set-up?
I see:
https://wiki.yoctoproject.org/wiki/Synchronization_CVEs
and it mentions, but does not point to, "A synchronization wiki page".
../Randy
Regards
Meenali
------------------------------
*From:* Vijay Anusuri <[email protected]> <[email protected]> *Sent:* 16 November 2023 21:31
*To:* [email protected] <[email protected]> <[email protected]>; Ross Burton <[email protected]> <[email protected]>; Gupta, Meenali <[email protected]> <[email protected]> *Cc:* [email protected] <[email protected]> <[email protected]>
*Subject:* Re: [OE-core][kirkstone][PATCH] avahi: Fix for multiple CVE's*CAUTION: This email comes from a non Wind River email account!* Do not click links or open attachments unless you recognize the sender and know the content is safe.
Hi Ross,As discussed with Meenali, I agreed she was going to do this work. She has already submitted patches for multiple branches ( master, mickledore and kirkstone ).
For CVE-2023-38469, we need to include 2 commits to fix the CVE. Meenali will send the v2 patch for CVE-2023-38469 which will include 2 patches for all the branches.
Thank you Meenali for your timely response.
Thanks & Regards,
VijayOn Thu, Nov 16, 2023 at 7:56 PM Jeremy Puhlman via lists.openembedded.org
<https://urldefense.com/v3/__http://lists.openembedded.org__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPwKv5R-0$>
<[email protected]> wrote:Quoted 3 lines · Ross Burton
Hi Vijay and Meenali,
Hopefully this will show everyone - especially WR and Montavista - that
we need to communicate better when working on CVEs. In the short term at least, Marta proposed a wiki page which can be updated via a tool and when someone is working on an issue that can be marked to avoid duplication of effort. Would that be acceptable to both of your companies?
Yeah, I think something like that would be great on our end, provided its automated and the data can be extracted, so it can be consolidated in internal CVE tracking that we are currently required to.
Quoted 2 lines
I’ve not checked that the fixes are identical, but apparently I need to
remind everyone that we take fixes in *master first* and then backport to the releases in order.
There should also be an agree upon change decoration to indicate non-applicability/differently addressed in earlier releases.With 4 year LTS releases many issues are just not going to be applicable to master. Also there may well be very good reasons to fix a given set of CVEs in
completely different ways, but making sure they are addressed in both is important. Setting aside this example, in almost all cases on master moving to the fixed version, is almost always the right answer, where as on say dunfell, moving to the new version may have too many knock on effects to make sense.
In this instance, Khem has already indicated moving to the new release may make sense for both kirkstone and master.Quoted 2 lines
Luckily the avahi recipe is fairly untouched so this should be trivial.
Can you both discuss and agree who is going to do this? Vijay can you work with Meenali to consolidate this patch.
Quoted 4 lines
Ross
Quoted 1 line
On 16 Nov 2023, at 04:05, Vijay Anusuri via lists.openembedded.org
Quoted 11 lines · <[email protected]> wrote:
Quoted 11 lines
From: Vijay Anusuri <[email protected]>
Patches to fix:
CVE-2023-38469
CVE-2023-38470
CVE-2023-38471
CVE-2023-38472
CVE-2023-38473Upstream-Status: Backport [
https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf
<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPSO96cKo$>Quoted 2 lines
Quoted 2 lines
&
https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237
<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPlqjXgoU$>Quoted 2 lines
Quoted 2 lines
&
https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c
<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPRzxTKP8$>Quoted 2 lines
Quoted 2 lines
&
https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09
<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPwzmpbVo$>Quoted 2 lines
Quoted 2 lines
&
https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40
<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPOROFOvo$>Quoted 2 lines
Quoted 2 lines
&
https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797
<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPLLeXBTg$>
]Quoted 4 lines
Quoted 4 lines
Signed-off-by Vijay Anusuri <[email protected]>---
meta/recipes-connectivity/avahi/avahi_0.8.bbQuoted 8 lines
Quoted 8 lines
.../avahi/files/CVE-2023-38469-1.patch | 47 ++++++++ .../avahi/files/CVE-2023-38469-2.patch | 65 +++++++++++ .../avahi/files/CVE-2023-38470.patch | 56 +++++++++ .../avahi/files/CVE-2023-38471.patch | 72 ++++++++++++ .../avahi/files/CVE-2023-38472.patch | 47 ++++++++ .../avahi/files/CVE-2023-38473.patch | 108 ++++++++++++++++++ 7 files changed, 401 insertions(+)create mode 100644
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patchQuoted 1 line
Quoted 1 line
create mode 100644
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patchQuoted 1 line
Quoted 1 line
create mode 100644
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patchQuoted 1 line
Quoted 1 line
create mode 100644
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patchQuoted 1 line
Quoted 1 line
create mode 100644
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patchQuoted 1 line
Quoted 1 line
create mode 100644
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patchQuoted 2 lines
Review
Quoted 2 lines
(quoted diff) +0
-0<https://urldefense.com/v3/__http://avahi_0.8.bb__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPSo_Ck9E$>
b/meta/recipes-connectivity/avahi/avahi_0.8.bb
<https://urldefense.com/v3/__http://avahi_0.8.bb__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPSo_Ck9E$>Quoted 2 lines
Quoted 2 lines
index
b5c966c102..772fb43939100644
--- a/meta/recipes-connectivity/avahi/avahi_0.8.bbQuoted 1 line
Quoted 1 line
+++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb
Quoted 1 line
Review SRC_URI = "
Quoted 1 line
(quoted diff) +0
-0@@ -26,6 +26,12 @@ SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}
<https://urldefense.com/v3/__https://github.com/lathiat/avahi/releases/download/v$*7BPV*7D/avahi-$*7BPV*7D__;JSUlJQ!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHP0Am2ovI$>Quoted 11 lines
Quoted 11 lines
meta/recipes-connectivity/avahi/avahi_0.8.bb +6
-0file://0001-Fix-opening-etc-resolv.conf-error.patch \ file://handle-hup.patch \ file://local-ping.patch \ + file://CVE-2023-38469-1.patch \ + file://CVE-2023-38469-2.patch \ + file://CVE-2023-38470.patch \ + file://CVE-2023-38471.patch \ + file://CVE-2023-38472.patch \ + file://CVE-2023-38473.patch \ "Quoted 1 line
Quoted 1 line
UPSTREAM_CHECK_URI= "https://github.com/lathiat/avahi/releases/Quoted 1 line
Quoted 1 line
diff --git
a/meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patchb/meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patchQuoted 11 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch line 6
Quoted 11 lines
new file mode 100644
index 0000000000..99c717daf3meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +6
-0@@ -0,0 +1,47 @@ +From a337a1ba7d15853fb56deef1f464529af6e3a1cf Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin <[email protected]> +Date: Mon, 23 Oct 2023 20:29:31 +0000 +Subject: [PATCH] core: reject overly long TXT resource records + +Closes https://github.com/lathiat/avahi/issues/455Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +4
-0+ +CVE-2023-38469 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf
<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPSO96cKo$>
]Quoted 17 lines
Quoted 17 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +17
-0+CVE: CVE-2023-38469 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-core/rr.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/avahi-core/rr.c b/avahi-core/rr.c +index 2bb89244..9c04ebbd 100644 +--- a/avahi-core/rr.c ++++ b/avahi-core/rr.c +@@ -32,6 +32,7 @@ + #include <avahi-common/malloc.h> + #include <avahi-common/defs.h> + ++#include "dns.h" + #include "rr.h" + #include "log.h"Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +8
-0+ #include "util.h" +@@ -689,11 +690,17 @@ int avahi_record_is_valid(AvahiRecord *r) { + case AVAHI_DNS_TYPE_TXT: { + + AvahiStringList *strlst; ++ size_t used = 0; + +- for (strlst = r->data.txt.string_list; strlst; strlst =
strlst->next)Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch line 36
Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +1
-0++ for (strlst = r->data.txt.string_list; strlst; strlst =
strlst->next) {Quoted 4 lines
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +4
-0+ if (strlst->size > 255 || strlst->size <= 0) + return 0; + ++ used += 1+strlst->size;Quoted 8 lines
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +7
-0++ if (used > AVAHI_DNS_RDATA_MAX) ++ return 0; ++ } ++ + return 1; + } + }diff --git
a/meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patchb/meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patchQuoted 5 lines
Quoted 5 lines
new file mode 100644
index 0000000000..b83a70e29bmeta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +0
-0@@ -0,0 +1,65 @@Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch line 8
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +8
-0+From c6cab87df290448a63323c8ca759baa516166237 Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin <[email protected]> +Date: Wed, 25 Oct 2023 18:15:42 +0000 +Subject: [PATCH] tests: pass overly long TXT resource records + +to make sure they don't crash avahi any more. + +It reproduces https://github.com/lathiat/avahi/issues/455Quoted 2 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch line 10
Quoted 2 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +2
-0+ +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237
<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPlqjXgoU$>
]Quoted 20 lines
Quoted 20 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +20
-0+CVE: CVE-2023-38469 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-client/client-test.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c +index 7d04a6a..66e3574 100644 +--- a/avahi-client/client-test.c ++++ b/avahi-client/client-test.c +@@ -22,6 +22,7 @@ + #endif + + #include <stdio.h> ++#include <string.h> + #include <assert.h> + + #include <avahi-client/client.h> +@@ -33,6 +34,8 @@ + #include <avahi-common/malloc.h>Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +8
-0+ #include <avahi-common/timeval.h> + ++#include <avahi-core/dns.h> ++ + static const AvahiPoll *poll_api = NULL; + static AvahiSimplePoll *simple_poll = NULL; + +@@ -222,6 +225,9 @@ int main (AVAHI_GCC_UNUSED int argc,
AVAHI_GCC_UNUSEDchar *argv[]) {Quoted 10 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch
Quoted 10 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +10
-0+ uint32_t cookie; + struct timeval tv; + AvahiAddress a; ++ uint8_t rdata[AVAHI_DNS_RDATA_MAX+1]; ++ AvahiStringList *txt = NULL; ++ int r; + + simple_poll = avahi_simple_poll_new(); + poll_api = avahi_simple_poll_get(simple_poll); +@@ -258,6 +264,14 @@ int main (AVAHI_GCC_UNUSED int argc,
AVAHI_GCC_UNUSEDchar *argv[]) {Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch line 49
Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +1
-0+ printf("%s\n", avahi_strerror(avahi_entry_group_add_service(group,
AVAHI_IF_UNSPEC,AVAHI_PROTO_UNSPEC, 0, "Lathiat's Site", "_http._tcp", NULL, NULL, 80, "foo=bar", NULL)));Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch line 50
Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +1
-0+ printf("add_record: %d\n", avahi_entry_group_add_record (group,
AVAHI_IF_UNSPEC,AVAHI_PROTO_UNSPEC, 0, "TestX",0x01,0x10, 120, "\5booya", 6));Quoted 5 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch
Quoted 5 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +5
-0+ ++ memset(rdata, 1, sizeof(rdata)); ++ r = avahi_string_list_parse(rdata, sizeof(rdata), &txt); ++ assert(r >= 0); ++ assert(avahi_string_list_serialize(txt, NULL, 0) ==sizeof(rdata));
Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch line 56
Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +1
-0++ error = avahi_entry_group_add_service_strlst(group,
AVAHI_IF_UNSPEC,AVAHI_PROTO_UNSPEC, 0, "TestX", "_qotd._tcp", NULL, NULL, 123, txt);Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch
Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +6
-0++ assert(error == AVAHI_ERR_INVALID_RECORD); ++ avahi_string_list_free(txt); ++ + avahi_entry_group_commit (group); + + domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC,
AVAHI_PROTO_UNSPEC, NULL,AVAHI_DOMAIN_BROWSER_BROWSE, 0,avahi_domain_browser_callback, (char*) "omghai3u");Quoted 4 lines
Review
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +3
-0+-- +2.25.1 +(quoted diff) +0
-0
b/meta/recipes-connectivity/avahi/files/CVE-2023-38470.patchQuoted 8 lines
Quoted 8 lines
new file mode 100644
index 0000000000..1cbb00dcabmeta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +3
-0@@ -0,0 +1,56 @@ +From 94cb6489114636940ac683515417990b55b5d66c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <[email protected]> +Date: Tue, 11 Apr 2023 15:29:59 +0200Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +8
-0+Subject: [PATCH] Ensure each label is at least one byte long + +The only allowed exception is single dot, where it should return empty +string. + +Fixes #454. + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c
<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPRzxTKP8$>
]Quoted 4 lines
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +4
-0+CVE: CVE-2023-38470 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-common/domain-test.c | 14 ++++++++++++++Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +8
-0+ avahi-common/domain.c | 2 +- + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/avahi-common/domain-test.c b/avahi-common/domain-test.c +index cf763eca6..3acc1c1e4 100644 +--- a/avahi-common/domain-test.c ++++ b/avahi-common/domain-test.c +@@ -45,6 +45,20 @@ int main(AVAHI_GCC_UNUSED int argc,
AVAHI_GCC_UNUSEDchar *argv[]) {Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch line 24
Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +1
-0+ printf("%s\n", s = avahi_normalize_name_strdup("fo\\\\o\\..foo."));
Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch
Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +6
-0+ avahi_free(s); + ++ printf("%s\n", s = avahi_normalize_name_strdup(".")); ++ avahi_free(s); ++ ++ s =avahi_normalize_name_strdup(",.=.}.=.?-.}.=.?.?.}.}.?.?.?.z.?.?.}.}."
Quoted 11 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch
Quoted 11 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +11
-0++ "}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.}.}.}" ++ ".?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.?.zM.?`" ++ "?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}??.}.}.?.?." ++ "?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.?`?.}.}.}." ++ "??.?.zM.?`?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}?" ++ "?.}.}.?.?.?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM." ++ "?`?.}.}.}.?.?.?.r.=.=.?.?`.?.?}.}.}.?.?.?.r.=.?.}.=.?.?." ++ "}.?.?.?.}.=.?.?.}"); ++ assert(s == NULL); ++ + printf("%i\n", avahi_domain_equal("\\065aabbb\\.\\046cc.cc\\\\.dee.fff.", "Aaa BBB\\.\\.cc.cc\\\\.dee.fff"));
Quoted 7 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch
Quoted 7 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +7
-0+ printf("%i\n", avahi_domain_equal("A", "a")); + +diff --git a/avahi-common/domain.c b/avahi-common/domain.c +index 3b1ab6834..e66d2416c 100644 +--- a/avahi-common/domain.c ++++ b/avahi-common/domain.c +@@ -201,7 +201,7 @@ char *avahi_normalize_name(const char *s, char
*ret_s,size_tsize) {Quoted 9 lines
Review
Quoted 9 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +8
-0+ } + + if (!empty) { +- if (size < 1) ++ if (size < 2) + return NULL; + + *(r++) = '.';(quoted diff) +0
-0
b/meta/recipes-connectivity/avahi/files/CVE-2023-38471.patchQuoted 12 lines
Quoted 12 lines
new file mode 100644
index 0000000000..8242646da1meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +7
-0@@ -0,0 +1,72 @@ +From 894f085f402e023a98cbb6f5a3d117bd88d93b09 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]> +Date: Mon, 23 Oct 2023 13:38:35 +0200 +Subject: [PATCH] core: extract host name using avahi_unescape_label() + +Previously we could create invalid escape sequence when we split the +string on dot. For example, from valid host name "foo\\.bar" we haveQuoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +8
-0+created invalid name "foo\\" and tried to set that as the host name +which crashed the daemon. + +Fixes #453 + +CVE-2023-38471 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09
<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPwzmpbVo$>
]Quoted 6 lines
Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +6
-0+CVE: CVE-2023-38471 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-core/server.c | 27 +++++++++++++++++++++------ + 1 file changed, 21 insertions(+), 6 deletions(-) +Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +8
-0+diff --git a/avahi-core/server.c b/avahi-core/server.c +index c32637af8..f6a21bb77 100644 +--- a/avahi-core/server.c ++++ b/avahi-core/server.c +@@ -1295,7 +1295,11 @@ static void update_fqdn(AvahiServer *s) { + } + + int avahi_server_set_host_name(AvahiServer *s, const char *host_name){
Quoted 9 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch
Quoted 9 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +9
-0+- char *hn = NULL; ++ char label_escaped[AVAHI_LABEL_MAX*4+1]; ++ char label[AVAHI_LABEL_MAX]; ++ char *hn = NULL, *h; ++ size_t len; ++ + assert(s); + + AVAHI_CHECK_VALIDITY(s, !host_name ||
avahi_is_valid_host_name(host_name),AVAHI_ERR_INVALID_HOST_NAME);Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch line 39
Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +1
-0+@@ -1305,17 +1309,28 @@ int avahi_server_set_host_name(AvahiServer *s,const char
*host_name) {Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch
Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +6
-0+ else + hn = avahi_normalize_name_strdup(host_name); + +- hn[strcspn(hn, ".")] = 0; ++ h = hn; ++ if (!avahi_unescape_label((const char **)&hn, label,sizeof(label))) {
Quoted 4 lines
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +4
-0++ avahi_free(h); ++ return AVAHI_ERR_INVALID_HOST_NAME; ++ } ++Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +8
-0++ avahi_free(h); ++ ++ h = label_escaped; ++ len = sizeof(label_escaped); ++ if (!avahi_escape_label(label, strlen(label), &h, &len)) ++ return AVAHI_ERR_INVALID_HOST_NAME; + +- if (avahi_domain_equal(s->host_name, hn) && s->state !=
AVAHI_SERVER_COLLISION) {Quoted 2 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch line 59
Quoted 2 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +2
-0+- avahi_free(hn); ++ if (avahi_domain_equal(s->host_name, label_escaped) && s->state!=
AVAHI_SERVER_COLLISION)Quoted 6 lines
Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +6
-0+ return avahi_server_set_errno(s, AVAHI_ERR_NO_CHANGE); +- } + + withdraw_host_rrs(s); + + avahi_free(s->host_name);Quoted 8 lines
Review
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +7
-0+- s->host_name = hn; ++ s->host_name = avahi_strdup(label_escaped); ++ if (!s->host_name) ++ return AVAHI_ERR_NO_MEMORY; + + update_fqdn(s); +(quoted diff) +0
-0
b/meta/recipes-connectivity/avahi/files/CVE-2023-38472.patchQuoted 9 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch line 4
Quoted 9 lines
new file mode 100644
index 0000000000..43b26c1132meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +4
-0@@ -0,0 +1,47 @@ +From b024ae5749f4aeba03478e6391687c3c9c8dee40 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]> +Date: Thu, 19 Oct 2023 17:36:44 +0200 +Subject: [PATCH] core: make sure there is rdata to process beforeparsing it
Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch
Quoted 6 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +6
-0+ +Fixes #452 + +CVE-2023-38472 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40
<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPOROFOvo$>
]Quoted 4 lines
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +4
-0+CVE: CVE-2023-38472 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-client/client-test.c | 3 +++Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +8
-0+ avahi-daemon/dbus-entry-group.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c +index 66e3574..9a015d7 100644 +--- a/avahi-client/client-test.c ++++ b/avahi-client/client-test.c +@@ -272,6 +272,9 @@ int main (AVAHI_GCC_UNUSED int argc,
AVAHI_GCC_UNUSEDchar *argv[]) {Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +4
-0+ assert(error == AVAHI_ERR_INVALID_RECORD); + avahi_string_list_free(txt); + ++ error = avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC,
AVAHI_PROTO_UNSPEC, 0, "TestX",0x01,0x10, 120, "", 0);Quoted 5 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch
Quoted 5 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +5
-0++ assert(error != AVAHI_OK); ++ + avahi_entry_group_commit (group); + + domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC,
AVAHI_PROTO_UNSPEC, NULL,AVAHI_DOMAIN_BROWSER_BROWSE, 0,avahi_domain_browser_callback, (char*) "omghai3u");Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch line 32
Quoted 1 line
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +1
-0+diff --git a/avahi-daemon/dbus-entry-group.c
b/avahi-daemon/dbus-entry-group.cQuoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +4
-0+index 4e879a5..aa23d4b 100644 +--- a/avahi-daemon/dbus-entry-group.c ++++ b/avahi-daemon/dbus-entry-group.c +@@ -340,7 +340,7 @@ DBusHandlerResultavahi_dbus_msg_entry_group_impl(DBusConnection *c, DBusMessage
Quoted 2 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch line 38
Quoted 2 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +2
-0+ if (!(r = avahi_record_new_full (name, clazz, type, ttl))) + return avahi_dbus_respond_error(c, m,
AVAHI_ERR_NO_MEMORY, NULL);Quoted 5 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch
Quoted 5 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +5
-0+ +- if (avahi_rdata_parse (r, rdata, size) < 0) { ++ if (!rdata || avahi_rdata_parse (r, rdata, size) < 0) { + avahi_record_unref (r); + return avahi_dbus_respond_error(c, m,
AVAHI_ERR_INVALID_RDATA, NULL);Quoted 5 lines
Review
Quoted 5 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +4
-0+ } +-- +2.25.1 +(quoted diff) +0
-0
b/meta/recipes-connectivity/avahi/files/CVE-2023-38473.patchQuoted 9 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch line 4
Quoted 9 lines
new file mode 100644
index 0000000000..7b33d564f8meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +4
-0@@ -0,0 +1,108 @@ +From b448c9f771bada14ae8de175695a9729f8646797 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]> +Date: Wed, 11 Oct 2023 17:45:44 +0200 +Subject: [PATCH] common: derive alternative host name from itsunescaped
Quoted 9 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch
Quoted 9 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +9
-0+ version + +Normalization of input makes sure we don't have to deal with special +cases like unescaped dot at the end of label. + +Fixes #451 #487 +CVE-2023-38473 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797
<https://urldefense.com/v3/__https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797__;!!AjveYdw8EvQ!YPO7NIVZeFhisahLwBZhGe79g5KJTQ1xZy2oR8nOiu1HFt04VXa4FsGlVur74kFZ8fbQ-9H_LG6OXVHPLLeXBTg$>
]Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +8
-0+CVE: CVE-2023-38473 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-common/alternative-test.c | 3 +++ + avahi-common/alternative.c | 27 +++++++++++++++++++-------- + 2 files changed, 22 insertions(+), 8 deletions(-) + +diff --git a/avahi-common/alternative-test.c
b/avahi-common/alternative-test.cQuoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +4
-0+index 9255435ec..681fc15b8 100644 +--- a/avahi-common/alternative-test.c ++++ b/avahi-common/alternative-test.c +@@ -31,6 +31,9 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSEDchar *argv[]) {
Quoted 2 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch line 41
Quoted 2 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +2
-0+ const char* const test_strings[] = { +"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch line 57
Quoted 4 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +4
-0+ "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXüüüüüüü", ++ ").", ++ "\\.", ++"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\\\\",
Quoted 75 lines
Quoted 75 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +75
-0+ "gurke", + "-", + " #", +diff --git a/avahi-common/alternative.c b/avahi-common/alternative.c +index b3d39f0ed..a094e6d76 100644 +--- a/avahi-common/alternative.c ++++ b/avahi-common/alternative.c +@@ -49,15 +49,20 @@ static void drop_incomplete_utf8(char *c) { + } + + char *avahi_alternative_host_name(const char *s) { ++ char label[AVAHI_LABEL_MAX], alternative[AVAHI_LABEL_MAX*4+1]; ++ char *alt, *r, *ret; + const char *e; +- char *r; ++ size_t len; + + assert(s); + + if (!avahi_is_valid_host_name(s)) + return NULL; + +- if ((e = strrchr(s, '-'))) { ++ if (!avahi_unescape_label(&s, label, sizeof(label))) ++ return NULL; ++ ++ if ((e = strrchr(label, '-'))) { + const char *p; + + e++; +@@ -74,19 +79,18 @@ char *avahi_alternative_host_name(const char *s) { + + if (e) { + char *c, *m; +- size_t l; + int n; + + n = atoi(e)+1; + if (!(m = avahi_strdup_printf("%i", n))) + return NULL; + +- l = e-s-1; ++ len = e-label-1; + +- if (l >= AVAHI_LABEL_MAX-1-strlen(m)-1) +- l = AVAHI_LABEL_MAX-1-strlen(m)-1; ++ if (len >= AVAHI_LABEL_MAX-1-strlen(m)-1) ++ len = AVAHI_LABEL_MAX-1-strlen(m)-1; + +- if (!(c = avahi_strndup(s, l))) { ++ if (!(c = avahi_strndup(label, len))) { + avahi_free(m); + return NULL; + } +@@ -100,7 +104,7 @@ char *avahi_alternative_host_name(const char *s) { + } else { + char *c; + +- if (!(c = avahi_strndup(s, AVAHI_LABEL_MAX-1-2))) ++ if (!(c = avahi_strndup(label, AVAHI_LABEL_MAX-1-2))) + return NULL; + + drop_incomplete_utf8(c); +@@ -109,6 +113,13 @@ char *avahi_alternative_host_name(const char *s) { + avahi_free(c); + } + ++ alt = alternative; ++ len = sizeof(alternative); ++ ret = avahi_escape_label(r, strlen(r), &alt, &len); ++ ++ avahi_free(r); ++ r = avahi_strdup(ret); ++ + assert(avahi_is_valid_host_name(r));Quoted 11 lines
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +2
-1+ + return r; --2.25.1
--
Jeremy Puhlman
[email protected]-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190851): https://lists.openembedded.org/g/openembedded-core/message/190851
Mute This Topic: https://lists.openembedded.org/mt/102621335/3616765
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=---
# Randy MacLeod
# Wind River Linux
Quoted 4 lines · Vijay Anusuri
Hi Ross and Steve,
Please consider this patch for the Kirkstone branch.
I have them in my kirkstone test queue.
Thanks,
Steve
Quoted 610 lines
As discussed again with Meenali, I will be sending patches to remaining branches.
Thanks & Regards,
VijayQuoted 604 lines · Randy MacLeod
Add Hari who will inform WR developers on his team once the CVE co-ordination scheme is available. Add Marta.
On 2023-11-17 9:11 a.m., Meenali Gupta via lists.openembedded.org wrote:
Hi Ross,
As discussed with Vijay, we'll cooperate on this CVE fixes.
Marta,
Do you have a wiki page set-up?
I see:
https://wiki.yoctoproject.org/wiki/Synchronization_CVEs
and it mentions, but does not point to, "A synchronization wiki page".
../Randy
Regards
Meenali
________________________________
From: Vijay Anusuri <[email protected]>
Sent: 16 November 2023 21:31
To: [email protected] <[email protected]>; Ross Burton <[email protected]>; Gupta, Meenali <[email protected]>
Cc: [email protected] <[email protected]>
Subject: Re: [OE-core][kirkstone][PATCH] avahi: Fix for multiple CVE'sCAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe. Hi Ross,As discussed with Meenali, I agreed she was going to do this work.
She has already submitted patches for multiple branches ( master, mickledore and kirkstone ).For CVE-2023-38469, we need to include 2 commits to fix the CVE. Meenali will send the v2 patch for CVE-2023-38469 which will include 2 patches for all the branches.
Thank you Meenali for your timely response.
Thanks & Regards,
VijayOn Thu, Nov 16, 2023 at 7:56 PM Jeremy Puhlman via lists.openembedded.org <[email protected]> wrote:
Quoted 3 lines · Ross Burton
Hi Vijay and Meenali,
Hopefully this will show everyone - especially WR and Montavista - that we need to communicate better when working on CVEs. In the short term at least, Marta proposed a wiki page which can be updated via a tool and when someone is working on an issue that can be marked to avoid duplication of effort. Would that be acceptable to both of your companies?
Yeah, I think something like that would be great on our end, provided its automated and the data can be extracted, so it can be consolidated in internal CVE tracking that we are currently required to.
Quoted 2 lines
I’ve not checked that the fixes are identical, but apparently I need to remind everyone that we take fixes in *master first* and then backport to the releases in order.
There should also be an agree upon change decoration to indicate non-applicability/differently addressed in earlier releases.
With 4 year LTS releases many issues are just not going to be applicable to master. Also there may well be very good reasons to fix a given set of CVEs in
completely different ways, but making sure they are addressed in both is important. Setting aside this example, in almost all cases on master moving to the fixed version, is almost always the right answer, where as on say dunfell, moving to the new version may have too many knock on effects to make sense.
In this instance, Khem has already indicated moving to the new release may make sense for both kirkstone and master.Quoted 2 lines
Luckily the avahi recipe is fairly untouched so this should be trivial. Can you both discuss and agree who is going to do this?
Vijay can you work with Meenali to consolidate this patch.
Quoted 489 lines
Ross
Quoted 486 lines · Vijay Anusuri via lists.openembedded.org
From: Vijay Anusuri <[email protected]>
Patches to fix:
CVE-2023-38469
CVE-2023-38470
CVE-2023-38471
CVE-2023-38472
CVE-2023-38473Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf
&
https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237
&
https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c
&
https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09
&
https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40
&
https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797]Signed-off-by Vijay Anusuri <[email protected]>---
meta/recipes-connectivity/avahi/avahi_0.8.bb | 6 + .../avahi/files/CVE-2023-38469-1.patch | 47 ++++++++ .../avahi/files/CVE-2023-38469-2.patch | 65 +++++++++++ .../avahi/files/CVE-2023-38470.patch | 56 +++++++++ .../avahi/files/CVE-2023-38471.patch | 72 ++++++++++++ .../avahi/files/CVE-2023-38472.patch | 47 ++++++++ .../avahi/files/CVE-2023-38473.patch | 108 ++++++++++++++++++ 7 files changed, 401 insertions(+)create mode 100644
meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38470.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38471.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38472.patchcreate mode 100644meta/recipes-connectivity/avahi/files/CVE-2023-38473.patchmeta/recipes-connectivity/avahi/avahi_0.8.bb +6
-0@@ -26,6 +26,12 @@ SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV} file://0001-Fix-opening-etc-resolv.conf-error.patch \ file://handle-hup.patch \ file://local-ping.patch \ + file://CVE-2023-38469-1.patch \ + file://CVE-2023-38469-2.patch \ + file://CVE-2023-38470.patch \ + file://CVE-2023-38471.patch \ + file://CVE-2023-38472.patch \ + file://CVE-2023-38473.patch \ "
UPSTREAM_CHECK_URI= "https://github.com/lathiat/avahi/releases/"meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch new file +47
-0@@ -0,0 +1,47 @@ +From a337a1ba7d15853fb56deef1f464529af6e3a1cf Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin <[email protected]> +Date: Mon, 23 Oct 2023 20:29:31 +0000 +Subject: [PATCH] core: reject overly long TXT resource records + +Closes https://github.com/lathiat/avahi/issues/455 + +CVE-2023-38469 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf] +CVE: CVE-2023-38469 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-core/rr.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/avahi-core/rr.c b/avahi-core/rr.c +index 2bb89244..9c04ebbd 100644 +--- a/avahi-core/rr.c ++++ b/avahi-core/rr.c +@@ -32,6 +32,7 @@ + #include <avahi-common/malloc.h> + #include <avahi-common/defs.h> + ++#include "dns.h" + #include "rr.h" + #include "log.h" + #include "util.h" +@@ -689,11 +690,17 @@ int avahi_record_is_valid(AvahiRecord *r) { + case AVAHI_DNS_TYPE_TXT: { + + AvahiStringList *strlst; ++ size_t used = 0; + +- for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) ++ for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) { + if (strlst->size > 255 || strlst->size <= 0) + return 0; + ++ used += 1+strlst->size; ++ if (used > AVAHI_DNS_RDATA_MAX) ++ return 0; ++ } ++ + return 1; + } + }meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch new file +65
-0@@ -0,0 +1,65 @@ +From c6cab87df290448a63323c8ca759baa516166237 Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin <[email protected]> +Date: Wed, 25 Oct 2023 18:15:42 +0000 +Subject: [PATCH] tests: pass overly long TXT resource records + +to make sure they don't crash avahi any more. + +It reproduces https://github.com/lathiat/avahi/issues/455 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237] +CVE: CVE-2023-38469 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-client/client-test.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c +index 7d04a6a..66e3574 100644 +--- a/avahi-client/client-test.c ++++ b/avahi-client/client-test.c +@@ -22,6 +22,7 @@ + #endif + + #include <stdio.h> ++#include <string.h> + #include <assert.h> + + #include <avahi-client/client.h> +@@ -33,6 +34,8 @@ + #include <avahi-common/malloc.h> + #include <avahi-common/timeval.h> + ++#include <avahi-core/dns.h> ++ + static const AvahiPoll *poll_api = NULL; + static AvahiSimplePoll *simple_poll = NULL; + +@@ -222,6 +225,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + uint32_t cookie; + struct timeval tv; + AvahiAddress a; ++ uint8_t rdata[AVAHI_DNS_RDATA_MAX+1]; ++ AvahiStringList *txt = NULL; ++ int r; + + simple_poll = avahi_simple_poll_new(); + poll_api = avahi_simple_poll_get(simple_poll); +@@ -258,6 +264,14 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + printf("%s\n", avahi_strerror(avahi_entry_group_add_service (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "Lathiat's Site", "_http._tcp", NULL, NULL, 80, "foo=bar", NULL))); + printf("add_record: %d\n", avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "\5booya", 6)); + ++ memset(rdata, 1, sizeof(rdata)); ++ r = avahi_string_list_parse(rdata, sizeof(rdata), &txt); ++ assert(r >= 0); ++ assert(avahi_string_list_serialize(txt, NULL, 0) == sizeof(rdata)); ++ error = avahi_entry_group_add_service_strlst(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", "_qotd._tcp", NULL, NULL, 123, txt); ++ assert(error == AVAHI_ERR_INVALID_RECORD); ++ avahi_string_list_free(txt); ++ + avahi_entry_group_commit (group); + + domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, avahi_domain_browser_callback, (char*) "omghai3u"); +-- +2.25.1 +meta/recipes-connectivity/avahi/files/CVE-2023-38470.patch new file +56
-0@@ -0,0 +1,56 @@ +From 94cb6489114636940ac683515417990b55b5d66c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <[email protected]> +Date: Tue, 11 Apr 2023 15:29:59 +0200 +Subject: [PATCH] Ensure each label is at least one byte long + +The only allowed exception is single dot, where it should return empty +string. + +Fixes #454. + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c] +CVE: CVE-2023-38470 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-common/domain-test.c | 14 ++++++++++++++ + avahi-common/domain.c | 2 +- + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/avahi-common/domain-test.c b/avahi-common/domain-test.c +index cf763eca6..3acc1c1e4 100644 +--- a/avahi-common/domain-test.c ++++ b/avahi-common/domain-test.c +@@ -45,6 +45,20 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + printf("%s\n", s = avahi_normalize_name_strdup("fo\\\\o\\..f oo.")); + avahi_free(s); + ++ printf("%s\n", s = avahi_normalize_name_strdup(".")); ++ avahi_free(s); ++ ++ s = avahi_normalize_name_strdup(",.=.}.=.?-.}.=.?.?.}.}.?.?.?.z.?.?.}.}." ++ "}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.}.}.}" ++ ".?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.?.zM.?`" ++ "?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}??.}.}.?.?." ++ "?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.?`?.}.}.}." ++ "??.?.zM.?`?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}?" ++ "?.}.}.?.?.?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM." ++ "?`?.}.}.}.?.?.?.r.=.=.?.?`.?.?}.}.}.?.?.?.r.=.?.}.=.?.?." ++ "}.?.?.?.}.=.?.?.}"); ++ assert(s == NULL); ++ + printf("%i\n", avahi_domain_equal("\\065aa bbb\\.\\046cc.cc\\\\.dee.fff.", "Aaa BBB\\.\\.cc.cc\\\\.dee.fff")); + printf("%i\n", avahi_domain_equal("A", "a")); + +diff --git a/avahi-common/domain.c b/avahi-common/domain.c +index 3b1ab6834..e66d2416c 100644 +--- a/avahi-common/domain.c ++++ b/avahi-common/domain.c +@@ -201,7 +201,7 @@ char *avahi_normalize_name(const char *s, char *ret_s, size_t size) { + } + + if (!empty) { +- if (size < 1) ++ if (size < 2) + return NULL; + + *(r++) = '.';meta/recipes-connectivity/avahi/files/CVE-2023-38471.patch new file +72
-0@@ -0,0 +1,72 @@ +From 894f085f402e023a98cbb6f5a3d117bd88d93b09 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]> +Date: Mon, 23 Oct 2023 13:38:35 +0200 +Subject: [PATCH] core: extract host name using avahi_unescape_label() + +Previously we could create invalid escape sequence when we split the +string on dot. For example, from valid host name "foo\\.bar" we have +created invalid name "foo\\" and tried to set that as the host name +which crashed the daemon. + +Fixes #453 + +CVE-2023-38471 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09] +CVE: CVE-2023-38471 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-core/server.c | 27 +++++++++++++++++++++------ + 1 file changed, 21 insertions(+), 6 deletions(-) + +diff --git a/avahi-core/server.c b/avahi-core/server.c +index c32637af8..f6a21bb77 100644 +--- a/avahi-core/server.c ++++ b/avahi-core/server.c +@@ -1295,7 +1295,11 @@ static void update_fqdn(AvahiServer *s) { + } + + int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { +- char *hn = NULL; ++ char label_escaped[AVAHI_LABEL_MAX*4+1]; ++ char label[AVAHI_LABEL_MAX]; ++ char *hn = NULL, *h; ++ size_t len; ++ + assert(s); + + AVAHI_CHECK_VALIDITY(s, !host_name || avahi_is_valid_host_name(host_name), AVAHI_ERR_INVALID_HOST_NAME); +@@ -1305,17 +1309,28 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { + else + hn = avahi_normalize_name_strdup(host_name); + +- hn[strcspn(hn, ".")] = 0; ++ h = hn; ++ if (!avahi_unescape_label((const char **)&hn, label, sizeof(label))) { ++ avahi_free(h); ++ return AVAHI_ERR_INVALID_HOST_NAME; ++ } ++ ++ avahi_free(h); ++ ++ h = label_escaped; ++ len = sizeof(label_escaped); ++ if (!avahi_escape_label(label, strlen(label), &h, &len)) ++ return AVAHI_ERR_INVALID_HOST_NAME; + +- if (avahi_domain_equal(s->host_name, hn) && s->state != AVAHI_SERVER_COLLISION) { +- avahi_free(hn); ++ if (avahi_domain_equal(s->host_name, label_escaped) && s->state != AVAHI_SERVER_COLLISION) + return avahi_server_set_errno(s, AVAHI_ERR_NO_CHANGE); +- } + + withdraw_host_rrs(s); + + avahi_free(s->host_name); +- s->host_name = hn; ++ s->host_name = avahi_strdup(label_escaped); ++ if (!s->host_name) ++ return AVAHI_ERR_NO_MEMORY; + + update_fqdn(s); +meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file +47
-0@@ -0,0 +1,47 @@ +From b024ae5749f4aeba03478e6391687c3c9c8dee40 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]> +Date: Thu, 19 Oct 2023 17:36:44 +0200 +Subject: [PATCH] core: make sure there is rdata to process before parsing it + +Fixes #452 + +CVE-2023-38472 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40] +CVE: CVE-2023-38472 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-client/client-test.c | 3 +++ + avahi-daemon/dbus-entry-group.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c +index 66e3574..9a015d7 100644 +--- a/avahi-client/client-test.c ++++ b/avahi-client/client-test.c +@@ -272,6 +272,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + assert(error == AVAHI_ERR_INVALID_RECORD); + avahi_string_list_free(txt); + ++ error = avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "", 0); ++ assert(error != AVAHI_OK); ++ + avahi_entry_group_commit (group); + + domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, avahi_domain_browser_callback, (char*) "omghai3u"); +diff --git a/avahi-daemon/dbus-entry-group.c b/avahi-daemon/dbus-entry-group.c +index 4e879a5..aa23d4b 100644 +--- a/avahi-daemon/dbus-entry-group.c ++++ b/avahi-daemon/dbus-entry-group.c +@@ -340,7 +340,7 @@ DBusHandlerResult avahi_dbus_msg_entry_group_impl(DBusConnection *c, DBusMessage + if (!(r = avahi_record_new_full (name, clazz, type, ttl))) + return avahi_dbus_respond_error(c, m, AVAHI_ERR_NO_MEMORY, NULL); + +- if (avahi_rdata_parse (r, rdata, size) < 0) { ++ if (!rdata || avahi_rdata_parse (r, rdata, size) < 0) { + avahi_record_unref (r); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_INVALID_RDATA, NULL); + } +-- +2.25.1 +meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +106
-0@@ -0,0 +1,108 @@ +From b448c9f771bada14ae8de175695a9729f8646797 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]> +Date: Wed, 11 Oct 2023 17:45:44 +0200 +Subject: [PATCH] common: derive alternative host name from its unescaped + version + +Normalization of input makes sure we don't have to deal with special +cases like unescaped dot at the end of label. + +Fixes #451 #487 +CVE-2023-38473 + +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797] +CVE: CVE-2023-38473 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + avahi-common/alternative-test.c | 3 +++ + avahi-common/alternative.c | 27 +++++++++++++++++++-------- + 2 files changed, 22 insertions(+), 8 deletions(-) + +diff --git a/avahi-common/alternative-test.c b/avahi-common/alternative-test.c +index 9255435ec..681fc15b8 100644 +--- a/avahi-common/alternative-test.c ++++ b/avahi-common/alternative-test.c +@@ -31,6 +31,9 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + const char* const test_strings[] = { + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXüüüüüüü", ++ ").", ++ "\\.", ++ "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\\\\", + "gurke", + "-", + " #", +diff --git a/avahi-common/alternative.c b/avahi-common/alternative.c +index b3d39f0ed..a094e6d76 100644 +--- a/avahi-common/alternative.c ++++ b/avahi-common/alternative.c +@@ -49,15 +49,20 @@ static void drop_incomplete_utf8(char *c) { + } + + char *avahi_alternative_host_name(const char *s) { ++ char label[AVAHI_LABEL_MAX], alternative[AVAHI_LABEL_MAX*4+1]; ++ char *alt, *r, *ret; + const char *e; +- char *r; ++ size_t len; + + assert(s); + + if (!avahi_is_valid_host_name(s)) + return NULL; + +- if ((e = strrchr(s, '-'))) { ++ if (!avahi_unescape_label(&s, label, sizeof(label))) ++ return NULL; ++ ++ if ((e = strrchr(label, '-'))) { + const char *p; + + e++; +@@ -74,19 +79,18 @@ char *avahi_alternative_host_name(const char *s) { + + if (e) { + char *c, *m; +- size_t l; + int n; + + n = atoi(e)+1; + if (!(m = avahi_strdup_printf("%i", n))) + return NULL; + +- l = e-s-1; ++ len = e-label-1; + +- if (l >= AVAHI_LABEL_MAX-1-strlen(m)-1) +- l = AVAHI_LABEL_MAX-1-strlen(m)-1; ++ if (len >= AVAHI_LABEL_MAX-1-strlen(m)-1) ++ len = AVAHI_LABEL_MAX-1-strlen(m)-1; + +- if (!(c = avahi_strndup(s, l))) { ++ if (!(c = avahi_strndup(label, len))) { + avahi_free(m); + return NULL; + } +@@ -100,7 +104,7 @@ char *avahi_alternative_host_name(const char *s) { + } else { + char *c; + +- if (!(c = avahi_strndup(s, AVAHI_LABEL_MAX-1-2))) ++ if (!(c = avahi_strndup(label, AVAHI_LABEL_MAX-1-2))) + return NULL; + + drop_incomplete_utf8(c); +@@ -109,6 +113,13 @@ char *avahi_alternative_host_name(const char *s) { + avahi_free(c); + } + ++ alt = alternative; ++ len = sizeof(alternative); ++ ret = avahi_escape_label(r, strlen(r), &alt, &len); ++ ++ avahi_free(r); ++ r = avahi_strdup(ret); ++ + assert(avahi_is_valid_host_name(r));Quoted 11 lines
Quoted 8 lines
meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch new file +2
-1+ + return r; --2.25.1
--
Jeremy Puhlman
[email protected]-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190851): https://lists.openembedded.org/g/openembedded-core/message/190851
Mute This Topic: https://lists.openembedded.org/mt/102621335/3616765
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=---
# Randy MacLeod
# Wind River Linux